Skip to content

Commit f1e190c

Browse files
authored
feat(client-sso*): remove auth dependencies if client doesn't need (#2037)
* chore: not to import auth config when not required at all * feat(client-sso*): remove auth dependencies if client doesn't need
1 parent 16214be commit f1e190c

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

clients/client-sso-oidc/SSOOIDCClient.ts

+5-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
} from "@aws-sdk/middleware-host-header";
2323
import { getLoggerPlugin } from "@aws-sdk/middleware-logger";
2424
import { RetryInputConfig, RetryResolvedConfig, getRetryPlugin, resolveRetryConfig } from "@aws-sdk/middleware-retry";
25-
import { AwsAuthInputConfig, AwsAuthResolvedConfig, resolveAwsAuthConfig } from "@aws-sdk/middleware-signing";
2625
import {
2726
UserAgentInputConfig,
2827
UserAgentResolvedConfig,
@@ -160,7 +159,6 @@ export type SSOOIDCClientConfig = Partial<__SmithyConfiguration<__HttpHandlerOpt
160159
ClientDefaults &
161160
RegionInputConfig &
162161
EndpointsInputConfig &
163-
AwsAuthInputConfig &
164162
RetryInputConfig &
165163
HostHeaderInputConfig &
166164
UserAgentInputConfig;
@@ -169,7 +167,6 @@ export type SSOOIDCClientResolvedConfig = __SmithyResolvedConfiguration<__HttpHa
169167
Required<ClientDefaults> &
170168
RegionResolvedConfig &
171169
EndpointsResolvedConfig &
172-
AwsAuthResolvedConfig &
173170
RetryResolvedConfig &
174171
HostHeaderResolvedConfig &
175172
UserAgentResolvedConfig;
@@ -209,12 +206,11 @@ export class SSOOIDCClient extends __Client<
209206
};
210207
let _config_1 = resolveRegionConfig(_config_0);
211208
let _config_2 = resolveEndpointsConfig(_config_1);
212-
let _config_3 = resolveAwsAuthConfig(_config_2);
213-
let _config_4 = resolveRetryConfig(_config_3);
214-
let _config_5 = resolveHostHeaderConfig(_config_4);
215-
let _config_6 = resolveUserAgentConfig(_config_5);
216-
super(_config_6);
217-
this.config = _config_6;
209+
let _config_3 = resolveRetryConfig(_config_2);
210+
let _config_4 = resolveHostHeaderConfig(_config_3);
211+
let _config_5 = resolveUserAgentConfig(_config_4);
212+
super(_config_5);
213+
this.config = _config_5;
218214
this.middlewareStack.use(getRetryPlugin(this.config));
219215
this.middlewareStack.use(getContentLengthPlugin(this.config));
220216
this.middlewareStack.use(getHostHeaderPlugin(this.config));

clients/client-sso-oidc/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"@aws-sdk/middleware-logger": "3.5.0",
4040
"@aws-sdk/middleware-retry": "3.5.0",
4141
"@aws-sdk/middleware-serde": "3.4.1",
42-
"@aws-sdk/middleware-signing": "3.5.0",
4342
"@aws-sdk/middleware-stack": "3.4.1",
4443
"@aws-sdk/middleware-user-agent": "3.5.0",
4544
"@aws-sdk/node-config-provider": "3.4.1",

clients/client-sso/SSOClient.ts

+5-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
} from "@aws-sdk/middleware-host-header";
2121
import { getLoggerPlugin } from "@aws-sdk/middleware-logger";
2222
import { RetryInputConfig, RetryResolvedConfig, getRetryPlugin, resolveRetryConfig } from "@aws-sdk/middleware-retry";
23-
import { AwsAuthInputConfig, AwsAuthResolvedConfig, resolveAwsAuthConfig } from "@aws-sdk/middleware-signing";
2423
import {
2524
UserAgentInputConfig,
2625
UserAgentResolvedConfig,
@@ -160,7 +159,6 @@ export type SSOClientConfig = Partial<__SmithyConfiguration<__HttpHandlerOptions
160159
ClientDefaults &
161160
RegionInputConfig &
162161
EndpointsInputConfig &
163-
AwsAuthInputConfig &
164162
RetryInputConfig &
165163
HostHeaderInputConfig &
166164
UserAgentInputConfig;
@@ -169,7 +167,6 @@ export type SSOClientResolvedConfig = __SmithyResolvedConfiguration<__HttpHandle
169167
Required<ClientDefaults> &
170168
RegionResolvedConfig &
171169
EndpointsResolvedConfig &
172-
AwsAuthResolvedConfig &
173170
RetryResolvedConfig &
174171
HostHeaderResolvedConfig &
175172
UserAgentResolvedConfig;
@@ -207,12 +204,11 @@ export class SSOClient extends __Client<
207204
};
208205
let _config_1 = resolveRegionConfig(_config_0);
209206
let _config_2 = resolveEndpointsConfig(_config_1);
210-
let _config_3 = resolveAwsAuthConfig(_config_2);
211-
let _config_4 = resolveRetryConfig(_config_3);
212-
let _config_5 = resolveHostHeaderConfig(_config_4);
213-
let _config_6 = resolveUserAgentConfig(_config_5);
214-
super(_config_6);
215-
this.config = _config_6;
207+
let _config_3 = resolveRetryConfig(_config_2);
208+
let _config_4 = resolveHostHeaderConfig(_config_3);
209+
let _config_5 = resolveUserAgentConfig(_config_4);
210+
super(_config_5);
211+
this.config = _config_5;
216212
this.middlewareStack.use(getRetryPlugin(this.config));
217213
this.middlewareStack.use(getContentLengthPlugin(this.config));
218214
this.middlewareStack.use(getHostHeaderPlugin(this.config));

clients/client-sso/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"@aws-sdk/middleware-logger": "3.5.0",
4040
"@aws-sdk/middleware-retry": "3.5.0",
4141
"@aws-sdk/middleware-serde": "3.4.1",
42-
"@aws-sdk/middleware-signing": "3.5.0",
4342
"@aws-sdk/middleware-stack": "3.4.1",
4443
"@aws-sdk/middleware-user-agent": "3.5.0",
4544
"@aws-sdk/node-config-provider": "3.4.1",

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java

+12
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public List<RuntimeClientPlugin> getClientPlugins() {
5454
.build(),
5555
RuntimeClientPlugin.builder()
5656
.withConventions(AwsDependency.MIDDLEWARE_SIGNING.dependency, "AwsAuth", HAS_CONFIG)
57+
.servicePredicate((m, s) -> !isAllOptionalAuthOperation(m, s))
5758
.build(),
5859
RuntimeClientPlugin.builder()
5960
.withConventions(AwsDependency.MIDDLEWARE_SIGNING.dependency, "AwsAuth", HAS_MIDDLEWARE)
@@ -175,4 +176,15 @@ private static boolean hasOptionalAuthOperation(Model model, ServiceShape servic
175176
}
176177
return false;
177178
}
179+
180+
private static boolean isAllOptionalAuthOperation(Model model, ServiceShape service) {
181+
TopDownIndex topDownIndex = TopDownIndex.of(model);
182+
Set<OperationShape> operations = topDownIndex.getContainedOperations(service);
183+
for (OperationShape operation : operations) {
184+
if (!operation.getTrait(OptionalAuthTrait.class).isPresent()) {
185+
return false;
186+
}
187+
}
188+
return true;
189+
}
178190
}

0 commit comments

Comments
 (0)