Skip to content

Commit dc94070

Browse files
committed
add new web base (#167)
add service account upgrade to angular 20
1 parent 82fa263 commit dc94070

91 files changed

Lines changed: 8406 additions & 11187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

k8s/base/api/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
annotations:
1919
prometheus.io.scrape: 'true'
2020
spec:
21+
serviceAccountName: applicationname
2122
automountServiceAccountToken: false
2223
containers:
2324
- name: applicationname-api

k8s/base/api/mapping.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ spec:
3737
methods:
3838
- POST
3939
- GET
40+
- OPTIONS
4041
credentials: true
4142
headers:
4243
- 'x-requested-with'

k8s/base/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
resources:
5+
- ./sa.yaml
56
- ./worker
67
- ./api
78
- ./web

k8s/base/sa.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: applicationname
5+
---
6+
apiVersion: rbac.authorization.k8s.io/v1
7+
kind: Role
8+
metadata:
9+
name: applicationname
10+
rules:
11+
- apiGroups: ['']
12+
resources: ['']
13+
verbs: ['']
14+
---
15+
apiVersion: rbac.authorization.k8s.io/v1
16+
kind: RoleBinding
17+
metadata:
18+
name: applicationname
19+
subjects:
20+
- kind: ServiceAccount
21+
name: applicationname
22+
roleRef:
23+
kind: Role
24+
name: applicationname
25+
apiGroup: rbac.authorization.k8s.io

k8s/base/web/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
annotations:
1919
prometheus.io.scrape: 'true'
2020
spec:
21+
serviceAccountName: applicationname
2122
automountServiceAccountToken: false
2223
containers:
2324
- name: applicationname-web

k8s/base/worker/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
annotations:
1919
prometheus.io.scrape: 'true'
2020
spec:
21+
serviceAccountName: applicationname
2122
automountServiceAccountToken: false
2223
containers:
2324
- name: applicationname-worker
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
namespace ApplicationName.Api.Contracts;
2+
3+
public record DomainFault(Guid CorrelationId, string Message, string TraceId);

src/templates/api/ApplicationName.Api.Contracts/Dtos/ExampleCollectionDto.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ public record ExampleCollectionDto
99
public required Guid Id { get; init; }
1010

1111
[ProtoMember(2)]
12-
public required string Name { get; init; }
12+
public DateTime Created { get; init; }
1313

1414
[ProtoMember(3)]
15-
public required string Description { get; init; }
15+
public string Name { get; init; }
16+
17+
[ProtoMember(4)]
18+
public string Description { get; init; }
1619
}

src/templates/api/ApplicationName.Api/ApplicationName.Api.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
@@ -20,14 +20,14 @@
2020
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
2121
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.1.0" />
2222
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.6" />
23-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
23+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
2424
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9" />
2525
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
2626
<PackageReference Include="OpenTelemetry" Version="1.14.0" />
2727
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
2828
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
29-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
30-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
29+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
30+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

src/templates/api/ApplicationName.Api/Consumers/LocalEventHandler.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
using System.Diagnostics;
12
using ApplicationName.Api.Application.Repositories;
23
using ApplicationName.Api.Contracts;
4+
using ApplicationName.Shared.Commands;
35
using ApplicationName.Shared.Events;
46
using MassTransit;
57
using Microsoft.AspNetCore.SignalR;
@@ -44,4 +46,14 @@ public async Task Consume(ConsumeContext<ExampleRemoteCodeSetEvent> context)
4446
context.Message.Id
4547
});
4648
}
49+
50+
public async Task Consume(ConsumeContext<Fault<CreateExampleCommand>> context)
51+
{
52+
await hub.Clients.All.SendAsync($"{nameof(DomainFault)}_{nameof(CreateExampleCommand)}",
53+
new DomainFault(
54+
context.Message.Message.CorrelationId,
55+
context.Message.Exceptions[0].Message,
56+
Activity.Current?.TraceId.ToString() ?? string.Empty
57+
));
58+
}
4759
}

0 commit comments

Comments
 (0)