File tree Expand file tree Collapse file tree 3 files changed +24
-9
lines changed
smithy-typescript-codegen
src/main/java/software/amazon/smithy/typescript/codegen Expand file tree Collapse file tree 3 files changed +24
-9
lines changed Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ buildscript {
33
33
dependencies {
34
34
api(" software.amazon.smithy:smithy-codegen-core:$smithyVersion " )
35
35
api(" software.amazon.smithy:smithy-rules-engine:$smithyVersion " )
36
+ api(" software.amazon.smithy:smithy-aws-traits:$smithyVersion " )
36
37
api(" software.amazon.smithy:smithy-waiters:$smithyVersion " )
37
38
implementation(" software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion " )
38
39
}
Original file line number Diff line number Diff line change @@ -327,6 +327,14 @@ private void generateConstructor() {
327
327
writer .write ("let $L = __getRuntimeConfig(configuration);" ,
328
328
generateConfigVariable (configVariable ));
329
329
330
+ if (service .hasTrait (EndpointRuleSetTrait .class )) {
331
+ configVariable ++;
332
+ writer .write ("let $L = $L($L);" ,
333
+ generateConfigVariable (configVariable ),
334
+ "resolveClientEndpointParameters" ,
335
+ generateConfigVariable (configVariable - 1 ));
336
+ }
337
+
330
338
// Add runtime plugin "resolve" method calls. These are invoked one
331
339
// after the other until all of the runtime plugins have been called.
332
340
// Only plugins that have configuration are called. Each time the
@@ -350,14 +358,6 @@ private void generateConstructor() {
350
358
}
351
359
}
352
360
353
- if (service .hasTrait (EndpointRuleSetTrait .class )) {
354
- configVariable ++;
355
- writer .write ("let $L = $L($L);" ,
356
- generateConfigVariable (configVariable ),
357
- "resolveClientEndpointParameters" ,
358
- generateConfigVariable (configVariable - 1 ));
359
- }
360
-
361
361
writer .write ("super($L);" , generateConfigVariable (configVariable ));
362
362
writer .write ("this.config = $L;" , generateConfigVariable (configVariable ));
363
363
Original file line number Diff line number Diff line change 17
17
18
18
import java .nio .file .Paths ;
19
19
import java .util .Map ;
20
+ import software .amazon .smithy .aws .traits .ServiceTrait ;
21
+ import software .amazon .smithy .aws .traits .auth .SigV4Trait ;
20
22
import software .amazon .smithy .build .FileManifest ;
21
23
import software .amazon .smithy .model .Model ;
22
24
import software .amazon .smithy .model .node .ObjectNode ;
@@ -83,7 +85,13 @@ private void generateEndpointParameters() {
83
85
);
84
86
85
87
writer .write ("" );
86
- writer .write ("export type ClientResolvedEndpointParameters = ClientInputEndpointParameters;" );
88
+ writer .openBlock (
89
+ "export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {" ,
90
+ "};" ,
91
+ () -> {
92
+ writer .write ("defaultSigningName: string;" );
93
+ }
94
+ );
87
95
writer .write ("" );
88
96
89
97
writer .openBlock (
@@ -98,6 +106,12 @@ private void generateEndpointParameters() {
98
106
ruleSet .getObjectMember ("parameters" ).ifPresent (parameters -> {
99
107
parameters .accept (new RuleSetParametersVisitor (writer , true ));
100
108
});
109
+ ServiceTrait serviceTrait = service .getTrait (ServiceTrait .class ).get ();
110
+ writer .write (
111
+ "defaultSigningName: \" $L\" ," ,
112
+ service .getTrait (SigV4Trait .class ).map (SigV4Trait ::getName )
113
+ .orElse (serviceTrait .getArnNamespace ())
114
+ );
101
115
});
102
116
}
103
117
);
You can’t perform that action at this time.
0 commit comments