Skip to content

Commit 2764ee8

Browse files
Steven Yuansyall
authored andcommitted
fix(experimentalIdentityAndAuth): update DefaultIdentityProviderConfig to not dedupe
1 parent 3c2fced commit 2764ee8

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/auth/http/integration/AddHttpAuthSchemePlugin.java

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55

66
package software.amazon.smithy.typescript.codegen.auth.http.integration;
77

8-
import java.util.HashMap;
98
import java.util.Iterator;
109
import java.util.List;
1110
import java.util.Map;
1211
import java.util.stream.Collectors;
13-
import software.amazon.smithy.codegen.core.CodegenException;
1412
import software.amazon.smithy.codegen.core.Symbol;
1513
import software.amazon.smithy.model.knowledge.ServiceIndex;
1614
import software.amazon.smithy.model.shapes.ServiceShape;
@@ -147,30 +145,15 @@ private getIdentityProviderConfigProvider() {
147145
s.getModel(),
148146
s.getSettings());
149147
ServiceIndex serviceIndex = ServiceIndex.of(s.getModel());
150-
Map<ShapeId, HttpAuthScheme> httpAuthSchemes
151-
= AuthUtils.getAllEffectiveNoAuthAwareAuthSchemes(s.getService(), serviceIndex, authIndex);
152-
// TODO(experimentalIdentityAndAuth): figure out a better deduping strategy
153-
Map<String, ConfigField> visitedConfigFields = new HashMap<>();
148+
Map<ShapeId, HttpAuthScheme> httpAuthSchemes =
149+
AuthUtils.getAllEffectiveNoAuthAwareAuthSchemes(s.getService(), serviceIndex, authIndex);
154150
for (HttpAuthScheme scheme : httpAuthSchemes.values()) {
155151
if (scheme == null) {
156152
continue;
157153
}
158154
for (ConfigField configField : scheme.getConfigFields()) {
159-
if (visitedConfigFields.containsKey(configField.name())) {
160-
ConfigField visitedConfigField = visitedConfigFields.get(configField.name());
161-
if (!configField.equals(visitedConfigField)) {
162-
throw new CodegenException("Contradicting `ConfigField` definitions for `"
163-
+ configField.name()
164-
+ "`; existing: "
165-
+ visitedConfigField
166-
+ ", conflict: "
167-
+ configField);
168-
}
169-
} else {
170-
visitedConfigFields.put(configField.name(), configField);
171-
if (configField.type().equals(ConfigField.Type.MAIN)) {
172-
w.write("$S: config.$L,", scheme.getSchemeId().toString(), configField.name());
173-
}
155+
if (configField.type().equals(ConfigField.Type.MAIN)) {
156+
w.write("$S: config.$L,", scheme.getSchemeId().toString(), configField.name());
174157
}
175158
}
176159
}

0 commit comments

Comments
 (0)