Skip to content

Ensure that AuthSchemes added to Endpoint builder retain parameter ordering #1591

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.

Sign up for GitHub

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
Jan 25, 2023
Merged

Ensure that AuthSchemes added to Endpoint builder retain parameter ordering #1591

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b829507
Merge pull request #1 from awslabs/main
alextwoods Dec 13, 2022
9baf48d
Ensure authSchemes retain order
alextwoods Jan 24, 2023
377d7dc
Switch to using a sorted Map for authscheme properties to ensure they…
alextwoods Jan 25, 2023
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
5 changes: 4 additions & 1 deletion smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/language/Endpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@

import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
import java.util.stream.Collectors;
import software.amazon.smithy.model.FromSourceLocation;
import software.amazon.smithy.model.SourceLocation;
Expand Down Expand Up @@ -71,7 +73,8 @@ private Endpoint(Builder builder) {
builder.authSchemes.copy().stream()
.map(
authScheme -> {
Map<Identifier, Literal> base = new LinkedHashMap<>();
Map<Identifier, Literal> base = new TreeMap<>(
Comparator.comparing(Identifier::asString));
base.put(Identifier.of("name"), Literal.of(authScheme.left.asString()));
base.putAll(authScheme.right);
return Literal.record(base);
Expand Down