Skip to content

chore(util-endpoints): updates to dynamic endpoint resolver #3908

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 3 commits into from
Sep 7, 2022
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
4 changes: 3 additions & 1 deletion packages/util-endpoints/src/resolveEndpoint.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { EndpointV2 } from "@aws-sdk/types";

import { EndpointError, EndpointResolverOptions, RuleSetObject } from "./types";
import { evaluateRules } from "./utils";

/**
* Resolves an endpoint URL by processing the endpoints ruleset and options.
*/
export const resolveEndpoint = (ruleSetObject: RuleSetObject, options: EndpointResolverOptions) => {
export const resolveEndpoint = (ruleSetObject: RuleSetObject, options: EndpointResolverOptions): EndpointV2 => {
const { endpointParams, logger } = options;
const { parameters, rules } = ruleSetObject;

Expand Down
2 changes: 1 addition & 1 deletion packages/util-endpoints/src/utils/evaluateCondition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ConditionObject, EndpointError, EvaluateOptions } from "../types";
import { callFunction } from "./callFunction";

export const evaluateCondition = ({ assign, ...fnArgs }: ConditionObject, options: EvaluateOptions) => {
if (assign && options.referenceRecord[assign]) {
if (assign && assign in options.referenceRecord) {
throw new EndpointError(`'${assign}' is already defined in Reference Record.`);
}
const value = callFunction(fnArgs, options);
Expand Down
4 changes: 3 additions & 1 deletion packages/util-endpoints/src/utils/evaluateRules.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { EndpointV2 } from "@aws-sdk/types";

import { EndpointError, EvaluateOptions, RuleSetRules } from "../types";
import { evaluateEndpointRule } from "./evaluateEndpointRule";
import { evaluateErrorRule } from "./evaluateErrorRule";
import { evaluateTreeRule } from "./evaluateTreeRule";

export const evaluateRules = (rules: RuleSetRules, options: EvaluateOptions) => {
export const evaluateRules = (rules: RuleSetRules, options: EvaluateOptions): EndpointV2 => {
for (const rule of rules) {
if (rule.type === "endpoint") {
const endpointOrUndefined = evaluateEndpointRule(rule, options);
Expand Down
1 change: 0 additions & 1 deletion packages/util-endpoints/src/utils/evaluateTemplate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Do not remove getAttr import. It's called during template evaluation.
import { getAttr } from "../lib";
import { EvaluateOptions } from "../types";

Expand Down