Skip to content

Skip generating ClientSettings for internal clients #10086

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
JoshLove-msft merged 4 commits into from
Mar 19, 2026
+9 −0
Merged

Skip generating ClientSettings for internal clients #10086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
360ee5c
Fix authenticationPolicy not used in internal ctor and skip settings …
JoshLove-msft Mar 19, 2026
e074f68
Merge remote-tracking branch 'upstream/main' into jolov/fix-auth-poli…
JoshLove-msft Mar 19, 2026
d2e5946
Remove redundant ClientOptions internal check
JoshLove-msft Mar 19, 2026
661af11
Add test assertions for ClientSettings not generated on internal clients
JoshLove-msft Mar 19, 2026
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
1 change: 1 addition & 0 deletions ...csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public ClientProvider(InputClient inputClient)
ClientOptionsParameter = ClientOptions != null ? ScmKnownParameters.ClientOptions(ClientOptions.Type) : null;
bool isIndividuallyInitialized = (_inputClient.InitializedBy & InputClientInitializedBy.Individually) != 0;
ClientSettings = isIndividuallyInitialized
&& DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)
? new ClientSettingsProvider(_inputClient, this)
: null;
IsMultiServiceClient = _inputClient.IsMultiServiceClient;
Expand Down
8 changes: 8 additions & 0 deletions ....Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ public async Task CanChangeClientAccessibility()
// The client options were not customized
Assert.IsTrue(clientOptionsProvider!.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public));

// ClientSettings should not be generated for internal clients
Assert.IsNull(((ClientProvider)clientProvider).ClientSettings,
"Internal client should not have ClientSettings generated");

// The docs should be generated even when then methods is internal
foreach (var method in clientProvider.Methods)
{
Expand Down Expand Up @@ -265,6 +269,10 @@ public async Task CanChangeClientOptionsAccessibility()
// The client options were not customized
Assert.IsTrue(clientOptionsProvider!.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Internal));

// ClientSettings should not be generated for internal clients
Assert.IsNull(((ClientProvider)clientProvider).ClientSettings,
"Internal client should not have ClientSettings generated");

// The docs should be generated even when then methods is internal
foreach (var method in clientProvider.Methods)
{
Expand Down
Loading