Skip to content

chore(parameters): revisit utility types #1223

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
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
2 changes: 0 additions & 2 deletions packages/parameters/src/BaseProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ abstract class BaseProvider implements BaseProviderInterface {
this.addToCache(key, value, configs.maxAge);
}

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

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

// TODO: revisit return type once providers are implemented, it might be missing something
return values;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/parameters/src/ssm/SSMProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import type {
SSMGetParametersByNameOptionsInterface,
SSMSplitBatchAndDecryptParametersOutputType,
SSMGetParametersByNameFromCacheOutputType,
} from 'types/SSMProvider';
} from '../types/SSMProvider';
import type { PaginationConfiguration } from '@aws-sdk/types';

class SSMProvider extends BaseProvider {
Expand Down
6 changes: 4 additions & 2 deletions packages/parameters/src/ssm/getParametersByName.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { SSMProvider, DEFAULT_PROVIDERS } from './SSMProvider';
import type { SSMGetParametersByNameOptionsInterface } from '../types/SSMProvider';
import type {
SSMGetParametersByNameOptionsInterface
} from '../types/SSMProvider';

const getParametersByName = (
parameters: Record<string, SSMGetParametersByNameOptionsInterface>,
options?: SSMGetParametersByNameOptionsInterface
): Promise<Record<string, unknown>> => {
): Promise<Record<string, unknown> & { _errors?: string[] }> => {
if (!DEFAULT_PROVIDERS.hasOwnProperty('ssm')) {
DEFAULT_PROVIDERS.ssm = new SSMProvider();
}
Expand Down
3 changes: 2 additions & 1 deletion packages/parameters/src/ssm/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './SSMProvider';
export * from './getParameter';
export * from './getParameters';
export * from './getParametersByName';
export * from './getParametersByName';
export * from '../types/SSMProvider';
2 changes: 1 addition & 1 deletion packages/parameters/src/types/AppConfigProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ interface GetAppConfigCombinedInterface
extends Omit<AppConfigProviderOptions, 'clientConfig'>,
AppConfigGetOptionsInterface {}

export {
export type {
AppConfigProviderOptions,
AppConfigGetOptionsInterface,
GetAppConfigCombinedInterface,
Expand Down
2 changes: 1 addition & 1 deletion packages/parameters/src/types/BaseProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface BaseProviderInterface {
getMultiple(path: string, options?: GetMultipleOptionsInterface): Promise<void | Record<string, unknown>>
}

export {
export type {
GetOptionsInterface,
GetMultipleOptionsInterface,
BaseProviderInterface,
Expand Down
8 changes: 6 additions & 2 deletions packages/parameters/src/types/SSMProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import type {
GetParameterCommandInput,
GetParametersByPathCommandInput
} from '@aws-sdk/client-ssm';
import type { GetOptionsInterface, GetMultipleOptionsInterface, TransformOptions } from './BaseProvider';
import type {
GetOptionsInterface,
GetMultipleOptionsInterface,
TransformOptions
} from './BaseProvider';

interface SSMProviderOptionsInterface {
clientConfig: SSMClientConfig
Expand Down Expand Up @@ -51,7 +55,7 @@ type SSMGetParametersByNameFromCacheOutputType = {
toFetch: Record<string, SSMGetParametersByNameOptionsInterface>
};

export {
export type {
SSMProviderOptionsInterface,
SSMGetOptionsInterface,
SSMGetMultipleOptionsInterface,
Expand Down
6 changes: 5 additions & 1 deletion packages/parameters/src/types/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
export * from './BaseProvider';
export * from './BaseProvider';
export * from './AppConfigProvider';
export * from './SSMProvider';
export * from './SecretsProvider';
export * from './DynamoDBProvider';
3 changes: 1 addition & 2 deletions packages/parameters/tests/unit/AppConfigProvider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
* @group unit/parameters/AppConfigProvider/class
*/
import { AppConfigProvider } from '../../src/appconfig/index';

import { AppConfigProviderOptions } from '../../src/types/AppConfigProvider';
import {
AppConfigDataClient,
StartConfigurationSessionCommand,
GetLatestConfigurationCommand,
} from '@aws-sdk/client-appconfigdata';
import { mockClient } from 'aws-sdk-client-mock';
import 'aws-sdk-client-mock-jest';
import { AppConfigProviderOptions } from '../../src/types/AppConfigProvider';

describe('Class: AppConfigProvider', () => {
const client = mockClient(AppConfigDataClient);
Expand Down
8 changes: 6 additions & 2 deletions packages/parameters/tests/unit/BaseProvider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
*
* @group unit/parameters/baseProvider/class
*/

import { BaseProvider, ExpirableValue, GetParameterError, TransformParameterError } from '../../src';
import {
BaseProvider,
ExpirableValue,
GetParameterError,
TransformParameterError
} from '../../src';
import { toBase64 } from '@aws-sdk/util-base64';

const encoder = new TextEncoder();
Expand Down
4 changes: 3 additions & 1 deletion packages/parameters/tests/unit/getParametersByName.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
import { DEFAULT_PROVIDERS } from '../../src/BaseProvider';
import { SSMProvider, getParametersByName } from '../../src/ssm';
import type { SSMGetParametersByNameOptionsInterface } from '../../src/types/SSMProvider';

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

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

// Prepare
const parameters = {
const parameters: Record<string, SSMGetParametersByNameOptionsInterface> = {
'/foo/bar': {
maxAge: 1000,
},
'/foo/baz': {
maxAge: 2000,
transform: 'json',
}
};
const getParametersByNameSpy = jest.spyOn(SSMProvider.prototype, 'getParametersByName').mockImplementation();
Expand Down