Skip to content

Commit c72971d

Browse files
joelsteventurnerjoelsteventurner
committed
Test bump
1 parent 9e01800 commit c72971d

File tree

18 files changed

+117
-17
lines changed

18 files changed

+117
-17
lines changed

‎Modules/Intent.Modules.Azure.KeyVault/release-notes.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### Version 2.0.15
2+
3+
- Improvement: Now works with `Azure Functions` apps.
4+
15
### Version 2.0.14
26

37
- Improvement: Updated NuGet package versions.

‎Modules/Intent.Modules.AzureFunctions/Intent.Modules.AzureFunctions.application.deviations.log.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,15 @@
3434
<deviationsHash>4D1CFBFF96BCB3DD54C3DD6A274D6BAAB605ACFE0AA2D40393D1914585EC64D7</deviationsHash>
3535
<fileHash>48CBF9DCF3CFF11ACFDCFAFE769BCC0689ADADACB69B8F29F4A2B413775CA82E</fileHash>
3636
</file>
37+
<file>
38+
<correlationId>Intent.ModuleBuilder.CSharp.Templates.CSharpTemplatePartial#3bb69eff-0d9c-43f6-b15d-72022316574e</correlationId>
39+
<path>Intent.Modules.AzureFunctions/Templates/Isolated/Program/ProgramTemplatePartial.cs</path>
40+
<count>1</count>
41+
<updatedByAccountName>[email protected]</updatedByAccountName>
42+
<updatedByDisplayName>Joel Turner</updatedByDisplayName>
43+
<updatedAt>2025-10-07T15:11:00.5961812Z</updatedAt>
44+
<deviationsHash>827BDF19C93D48C7A8EB08EB554C70FF447AEDE80256B15A1346010B078A9E3F</deviationsHash>
45+
<fileHash>7DBB03D8F0E1C2E845D9B99260753E50ED41FBC8772DCF06605AD5E694D68294</fileHash>
46+
</file>
3747
</files>
3848
</deviationsLog>

‎Modules/Intent.Modules.AzureFunctions/Templates/Isolated/Program/ProgramTemplatePartial.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace Intent.Modules.AzureFunctions.Templates.Isolated.Program
2626
{
27-
[IntentManaged(Mode.Fully, Body = Mode.Merge)]
27+
[IntentManaged(Mode.Merge, Body = Mode.Merge)]
2828
public partial class ProgramTemplate : CSharpTemplateBase<object>, ICSharpFileBuilderTemplate, IProgramTemplate, IProgramFile
2929
{
3030
public const string TemplateId = "Intent.AzureFunctions.Isolated.Program";
@@ -132,15 +132,15 @@ public ProgramTemplate(IOutputTarget outputTarget, object model = null) : base(T
132132
}
133133

134134
var hostConfigStatement = new CSharpMethodChainStatement("new HostBuilder()")
135-
.AddChainStatement( new CSharpInvocationStatement( "ConfigureFunctionsWebApplication").WithoutSemicolon()
135+
.AddChainStatement(new CSharpInvocationStatement("ConfigureFunctionsWebApplication").WithoutSemicolon()
136136
//.OnNewLine()
137137
.AddArgument(globalExceptionConfigStatement)
138138
)
139139
.AddChainStatement(new CSharpInvocationStatement("ConfigureServices").WithoutSemicolon()
140140
//.OnNewLine()
141141
.AddArgument(configStatements)
142142
)
143-
.AddChainStatement(new CSharpInvocationStatement("Build").OnNewLine());
143+
.AddChainStatement(new CSharpInvocationStatement("Build").OnNewLine().WithoutSemicolon());
144144

145145
tls.AddStatement(new CSharpAssignmentStatement("var host", hostConfigStatement));
146146
tls.AddStatement("host.Run();", s => s.SeparatedFromPrevious());
@@ -171,7 +171,7 @@ public ProgramTemplate(IOutputTarget outputTarget, object model = null) : base(T
171171
// after the other handlers.
172172
OnEmitOrPublished<ServiceConfigurationRequest>(ProcessServiceConfigurationRequest);
173173
OnEmitOrPublished<ContainerRegistrationRequest>(ProcessContainerRegistrationRequest);
174-
OnEmitOrPublished<ApplicationBuilderRegistrationRequest>(request =>
174+
OnEmitOrPublished<ApplicationBuilderRegistrationRequest>(request =>
175175
ProcessApplicationBuilderRegistrationRequest(request, globalExceptionConfigStatement));
176176
});
177177

@@ -327,7 +327,7 @@ private void ProcessApplicationBuilderRegistrationRequest(ApplicationBuilderRegi
327327
{
328328
return;
329329
}
330-
330+
331331
// Until we can resolve this better here is a blacklist of common middleware:
332332
if (request.ExtensionMethodName == "UseAuthentication")
333333
{
@@ -534,8 +534,8 @@ public IProgramFile ConfigureHostBuilderChainStatement(string methodName, IEnume
534534
appConfigurationBlock.AddMetadata("priority", priority);
535535

536536

537-
var insertAboveStatement = hostBuilderChain.Statements.FirstOrDefault(s =>
538-
{
537+
var insertAboveStatement = hostBuilderChain.Statements.FirstOrDefault(s =>
538+
{
539539
if (s.TryGetMetadata<int>("priority", out var statmentPriority))
540540
{
541541
return statmentPriority > priority;

‎Modules/Intent.Modules.AzureFunctions/release-notes.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### Version 5.0.17
2+
3+
- Improvement: Isolated Processes program file template upgraded for improved extensibility from other modules.
4+
15
### Version 5.0.16
26

37
- Improvement: Updated NuGet package versions.

‎Tests/AzureFunctions.AzureEventGrid.GroupA/modules.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<module moduleId="Intent.Application.MediatR.FluentValidation" version="4.9.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
1919
<module moduleId="Intent.Application.ServiceImplementations" version="4.5.13" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
2020
<module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.2.1" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
21-
<module moduleId="Intent.AzureFunctions" version="5.0.16" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
21+
<module moduleId="Intent.AzureFunctions" version="5.0.17-pre.0" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
2222
<module moduleId="Intent.AzureFunctions.AzureEventGrid" version="1.1.5" supportedClientVersions="[4.5.0-a,5.0.0)" />
2323
<module moduleId="Intent.AzureFunctions.Dispatch.MediatR" version="2.0.2" supportedClientVersions="[4.2.4, 5.0.0-a)" />
2424
<module moduleId="Intent.AzureFunctions.Dispatch.Services" version="5.0.3" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />

‎Tests/AzureFunctions.AzureEventGrid.GroupB/modules.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<module moduleId="Intent.Application.MediatR.FluentValidation" version="4.9.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
1919
<module moduleId="Intent.Application.ServiceImplementations" version="4.5.13" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
2020
<module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.2.1" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
21-
<module moduleId="Intent.AzureFunctions" version="5.0.16" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
21+
<module moduleId="Intent.AzureFunctions" version="5.0.17-pre.0" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
2222
<module moduleId="Intent.AzureFunctions.AzureEventGrid" version="1.1.5" supportedClientVersions="[4.5.0-a,5.0.0)" />
2323
<module moduleId="Intent.AzureFunctions.Dispatch.MediatR" version="2.0.2" supportedClientVersions="[4.2.4, 5.0.0-a)" />
2424
<module moduleId="Intent.AzureFunctions.Dispatch.Services" version="5.0.3" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />

‎Tests/AzureFunctions.AzureServiceBus.GroupA/modules.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<module moduleId="Intent.Application.MediatR.FluentValidation" version="4.9.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
1919
<module moduleId="Intent.Application.ServiceImplementations" version="4.5.13" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
2020
<module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.2.1" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
21-
<module moduleId="Intent.AzureFunctions" version="5.0.16" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
21+
<module moduleId="Intent.AzureFunctions" version="5.0.17-pre.0" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
2222
<module moduleId="Intent.AzureFunctions.AzureServiceBus" version="1.0.7" supportedClientVersions="[4.5.0-a,5.0.0)" />
2323
<module moduleId="Intent.AzureFunctions.Dispatch.MediatR" version="2.0.2" supportedClientVersions="[4.2.4, 5.0.0-a)" />
2424
<module moduleId="Intent.AzureFunctions.Dispatch.Services" version="5.0.3" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />

‎Tests/AzureFunctions.AzureServiceBus.GroupB/modules.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<module moduleId="Intent.Application.MediatR.FluentValidation" version="4.9.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
1919
<module moduleId="Intent.Application.ServiceImplementations" version="4.5.13" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
2020
<module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.2.1" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />
21-
<module moduleId="Intent.AzureFunctions" version="5.0.16" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
21+
<module moduleId="Intent.AzureFunctions" version="5.0.17-pre.0" supportedClientVersions="[4.5.15-a, 5.0.0-a)" />
2222
<module moduleId="Intent.AzureFunctions.AzureServiceBus" version="1.0.7" supportedClientVersions="[4.5.0-a,5.0.0)" />
2323
<module moduleId="Intent.AzureFunctions.Dispatch.MediatR" version="2.0.2" supportedClientVersions="[4.2.4, 5.0.0-a)" />
2424
<module moduleId="Intent.AzureFunctions.Dispatch.Services" version="5.0.3" supportedClientVersions="[4.5.0-a, 5.0.0-a)" />

‎Tests/AzureFunctions.MongoDb/AzureFunctions.MongoDb.Api/AzureFunctions.MongoDb.Api.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
</None>
2727
</ItemGroup>
2828
<ItemGroup>
29+
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
30+
<PackageReference Include="Azure.Identity" Version="1.16.0" />
31+
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.8.0" />
2932
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
3033
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.1.0" />
3134
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />

‎Tests/AzureFunctions.MongoDb/AzureFunctions.MongoDb.Api/Configuration/AzureKeyVaultConfiguration.cs‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
using System;
2+
using Azure.Core;
3+
using Azure.Identity;
4+
using Intent.RoslynWeaver.Attributes;
5+
using Microsoft.Extensions.Configuration;
6+
7+
[assembly: DefaultIntentManaged(Mode.Fully)]
8+
[assembly: IntentTemplate("Intent.Azure.KeyVault.AzureKeyVaultConfiguration", Version = "1.0")]
9+
10+
namespace AzureFunctions.MongoDb.Api.Configuration
11+
{
12+
public static class AzureKeyVaultConfiguration
13+
{
14+
public static void ConfigureAzureKeyVault(this IConfigurationBuilder builder, IConfiguration configuration)
15+
{
16+
var credential = GetTokenCredential(configuration);
17+
var endpoint = configuration["KeyVault:Endpoint"];
18+
19+
if (string.IsNullOrWhiteSpace(endpoint))
20+
{
21+
throw new InvalidOperationException("Configuration 'KeyVault:Endpoint' is not set");
22+
}
23+
builder.AddAzureKeyVault(new Uri(endpoint), credential);
24+
}
25+
26+
private static TokenCredential GetTokenCredential(IConfiguration configuration)
27+
{
28+
if (!string.IsNullOrWhiteSpace(configuration["KeyVault:TenantId"]) &&
29+
!string.IsNullOrWhiteSpace(configuration["KeyVault:ClientId"]) &&
30+
!string.IsNullOrWhiteSpace(configuration["KeyVault:Secret"]))
31+
{
32+
// Manually specify the connection details for Azure Key Vault.
33+
// Its recommended to store the 'Secret' inside the .NET User Secret's secrets.json file.
34+
return new ClientSecretCredential(configuration["KeyVault:TenantId"], configuration["KeyVault:ClientId"], configuration["KeyVault:Secret"]);
35+
}
36+
37+
if (!string.IsNullOrWhiteSpace(configuration["KeyVault:ClientId"]))
38+
{
39+
// Connect to Azure Key Vault using the configured App Client Id.
40+
return new DefaultAzureCredential(new DefaultAzureCredentialOptions
41+
{
42+
ManagedIdentityClientId = configuration["KeyVault:ClientId"]
43+
});
44+
}
45+
// Use the default discovery mechanisms to connect to Azure Key Vault.
46+
return new DefaultAzureCredential();
47+
}
48+
}
49+
}

0 commit comments

Comments
 (0)