Skip to content

Commit bf4a9a5

Browse files
committed
refactor: changed variable names in splitBatchAndDecryptParameters
1 parent 444bbc9 commit bf4a9a5

File tree

3 files changed

+33
-21
lines changed

3 files changed

+33
-21
lines changed

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ class SSMProvider extends BaseProvider {
7676
// NOTE: We fail early to avoid unintended graceful errors being replaced with their '_errors' param values
7777
SSMProvider.throwIfErrorsKeyIsPresent(parameters, this.errorsKey, configs.throwOnError);
7878

79-
const { batch, decrypt } = SSMProvider.splitBatchAndDecryptParameters(parameters, configs);
79+
const { parametersToFetchInBatch, parametersToDecrypt } = SSMProvider.splitBatchAndDecryptParameters(parameters, configs);
8080
// NOTE: We need to find out whether all parameters must be decrypted or not to know which API to use
8181
// Logic:
8282
// GetParameters API -> When decrypt is used for all parameters in the the batch
8383
// GetParameter API -> When decrypt is used for one or more in the batch
84-
if (Object.keys(decrypt).length !== Object.keys(parameters).length) {
85-
const { response: decryptResponse, errors: decryptErrors } = await this.getParametersByNameWithDecryptOption(decrypt, configs.throwOnError);
86-
const { response: batchResponse, errors: batchErrors } = await this.getParametersBatchByName(batch, configs.throwOnError, false);
84+
if (Object.keys(parametersToDecrypt).length !== Object.keys(parameters).length) {
85+
const { response: decryptResponse, errors: decryptErrors } = await this.getParametersByNameWithDecryptOption(parametersToDecrypt, configs.throwOnError);
86+
const { response: batchResponse, errors: batchErrors } = await this.getParametersBatchByName(parametersToFetchInBatch, configs.throwOnError, false);
8787

8888
response = { ...decryptResponse, ...batchResponse };
8989
// Fail-fast disabled, let's aggregate errors under "_errors" key so they can handle gracefully
9090
if (!configs.throwOnError) {
9191
response[this.errorsKey] = [ ...decryptErrors, ...batchErrors ];
9292
}
9393
} else {
94-
const { response: batchResponse, errors: batchErrors } = await this.getParametersBatchByName(decrypt, configs.throwOnError, true);
94+
const { response: batchResponse, errors: batchErrors } = await this.getParametersBatchByName(parametersToDecrypt, configs.throwOnError, true);
9595

9696
response = batchResponse;
9797
// Fail-fast disabled, let's aggregate errors under "_errors" key so they can handle gracefully
@@ -296,8 +296,8 @@ class SSMProvider extends BaseProvider {
296296
*/
297297
protected static splitBatchAndDecryptParameters(parameters: Record<string, SSMGetParametersByNameOptionsInterface>, configs: SSMGetParametersByNameOptionsInterface): SSMSplitBatchAndDecryptParametersOutputType {
298298
const splitParameters: SSMSplitBatchAndDecryptParametersOutputType = {
299-
batch: {},
300-
decrypt: {},
299+
parametersToFetchInBatch: {},
300+
parametersToDecrypt: {},
301301
};
302302

303303
for (const [ parameterName, parameterOptions ] of Object.entries(parameters)) {
@@ -312,9 +312,9 @@ class SSMProvider extends BaseProvider {
312312
}
313313

314314
if (overrides.decrypt) {
315-
splitParameters.decrypt[parameterName] = overrides;
315+
splitParameters.parametersToDecrypt[parameterName] = overrides;
316316
} else {
317-
splitParameters.batch[parameterName] = overrides;
317+
splitParameters.parametersToFetchInBatch[parameterName] = overrides;
318318
}
319319
}
320320

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ interface SSMGetParametersByNameOptionsInterface {
2929
}
3030

3131
type SSMSplitBatchAndDecryptParametersOutputType = {
32-
batch: Record<string, SSMGetParametersByNameOptionsInterface>
33-
decrypt: Record<string, SSMGetParametersByNameOptionsInterface>
32+
parametersToFetchInBatch: Record<string, SSMGetParametersByNameOptionsInterface>
33+
parametersToDecrypt: Record<string, SSMGetParametersByNameOptionsInterface>
3434
} & { [key: string]: SSMGetParametersByNameOptionsInterface };
3535

3636
interface SSMGetParametersByNameOutputInterface {

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

+22-10
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,10 @@ describe('Class: SSMProvider', () => {
939939
super();
940940
}
941941

942-
public splitBatchAndDecryptParameters(parameters: Record<string, SSMGetParametersByNameOptionsInterface>, configs: SSMGetParametersByNameOptionsInterface): SSMSplitBatchAndDecryptParametersOutputType {
942+
public splitBatchAndDecryptParameters(
943+
parameters: Record<string, SSMGetParametersByNameOptionsInterface>,
944+
configs: SSMGetParametersByNameOptionsInterface
945+
): SSMSplitBatchAndDecryptParametersOutputType {
943946
return SSMProvider.splitBatchAndDecryptParameters(parameters, configs);
944947
}
945948
}
@@ -956,11 +959,14 @@ describe('Class: SSMProvider', () => {
956959
};
957960

958961
// Act
959-
const { batch: notToDecrypt, decrypt } = provider.splitBatchAndDecryptParameters(parameters, {});
962+
const {
963+
parametersToFetchInBatch,
964+
parametersToDecrypt
965+
} = provider.splitBatchAndDecryptParameters(parameters, {});
960966

961967
// Assess
962-
expect(decrypt).toEqual({});
963-
expect(notToDecrypt).toEqual({
968+
expect(parametersToDecrypt).toEqual({});
969+
expect(parametersToFetchInBatch).toEqual({
964970
'/foo/bar': {},
965971
'/foo/baz': {
966972
maxAge: 1000,
@@ -983,16 +989,19 @@ describe('Class: SSMProvider', () => {
983989
};
984990

985991
// Act
986-
const { batch: notToDecrypt, decrypt } = provider.splitBatchAndDecryptParameters(parameters, {});
992+
const {
993+
parametersToFetchInBatch,
994+
parametersToDecrypt
995+
} = provider.splitBatchAndDecryptParameters(parameters, {});
987996

988997
// Assess
989-
expect(decrypt).toEqual({
998+
expect(parametersToDecrypt).toEqual({
990999
'/foo/bar': {
9911000
decrypt: true,
9921001
transform: undefined
9931002
},
9941003
});
995-
expect(notToDecrypt).toEqual({
1004+
expect(parametersToFetchInBatch).toEqual({
9961005
'/foo/baz': {
9971006
decrypt: false,
9981007
transform: undefined
@@ -1015,20 +1024,23 @@ describe('Class: SSMProvider', () => {
10151024
};
10161025

10171026
// Act
1018-
const { batch: notToDecrypt, decrypt } = provider.splitBatchAndDecryptParameters(parameters, {
1027+
const {
1028+
parametersToFetchInBatch,
1029+
parametersToDecrypt
1030+
} = provider.splitBatchAndDecryptParameters(parameters, {
10191031
decrypt: false,
10201032
maxAge: 2000,
10211033
});
10221034

10231035
// Assess
1024-
expect(decrypt).toEqual({
1036+
expect(parametersToDecrypt).toEqual({
10251037
'/foo/bar': {
10261038
decrypt: true,
10271039
maxAge: 2000,
10281040
transform: undefined
10291041
},
10301042
});
1031-
expect(notToDecrypt).toEqual({
1043+
expect(parametersToFetchInBatch).toEqual({
10321044
'/foo/baz': {
10331045
decrypt: false,
10341046
maxAge: 1000,

0 commit comments

Comments
 (0)