Skip to content
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

Add lab 4 #17

Merged
merged 14 commits into from
Feb 11, 2024
Merged

Add lab 4 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
49e5df1
Detach lab 4 src from CPM
DamianEdwards Feb 9, 2024
c24b025
Fix package versions
DamianEdwards Feb 9, 2024
6185162
Add lab 4 end & remove unused config values
DamianEdwards Feb 9, 2024
65eea79
Remove obsolete Razor warning suppression
DamianEdwards Feb 9, 2024
3c19c23
Remove unused method
DamianEdwards Feb 9, 2024
222f596
Correct casing of IdP
DamianEdwards Feb 9, 2024
f6346e8
Start lab 4 end
DamianEdwards Feb 10, 2024
f7d3b60
WIP
DamianEdwards Feb 10, 2024
70f0633
WIP
DamianEdwards Feb 10, 2024
317a75a
WIP
DamianEdwards Feb 10, 2024
3afec00
WIP
DamianEdwards Feb 10, 2024
4e121fb
WIP
DamianEdwards Feb 10, 2024
1fc4b6c
WIP
DamianEdwards Feb 11, 2024
e53fc2d
Finish lab 4
DamianEdwards Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.EventCounters" Version="1.5.1-alpha.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
<!-- Grpc -->
<PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcVersion)" />
<PackageVersion Include="Grpc.AspNetCore.Server.ClientFactory" Version="$(GrpcVersion)" />
Expand Down
12 changes: 6 additions & 6 deletions labs/1-Create-Catalog-API/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0-preview.3.24105.21" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
</ItemGroup>

</Project>
8 changes: 0 additions & 8 deletions labs/2-Create-Blazor-Frontend/end/Catalog.API/Apis/CatalogApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@ public static async Task<Results<NotFound, PhysicalFileHttpResult>> GetItemPictu
return TypedResults.PhysicalFile(path, contentType, lastModified: lastModified);
}

public static async Task<Results<BadRequest<string>, RedirectToRouteHttpResult, Ok<PaginatedItems<CatalogItem>>>> GetItemsBySemanticRelevance(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
string text)
{
return await GetItemsByName(paginationRequest, services, text);
}

public static async Task<Ok<PaginatedItems<CatalogItem>>> GetItemsByBrandAndTypeId(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
Expand Down
6 changes: 0 additions & 6 deletions labs/2-Create-Blazor-Frontend/end/Catalog.API/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
"Version": "v1"
}
},
"ConnectionStrings": {
"EventBus": "amqp://localhost"
},
"EventBus": {
"SubscriptionClientName": "Catalog"
},
"CatalogOptions": {
"PicBasePathFormat": "items/{0}/pic/"
}
Expand Down
3 changes: 0 additions & 3 deletions labs/2-Create-Blazor-Frontend/end/WebApp/WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<Nullable>enable</Nullable>
<RootNamespace>eShop.WebApp</RootNamespace>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>

<!-- Disable RZ10021, which is failing due to a Razor bug, according to Mackinnon. -->
<NoWarn>$(NoWarn);RZ10021</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions labs/2-Create-Blazor-Frontend/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0-preview.3.24105.21" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
</ItemGroup>
</Project>
8 changes: 0 additions & 8 deletions labs/2-Create-Blazor-Frontend/src/Catalog.API/Apis/CatalogApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@ public static async Task<Results<NotFound, PhysicalFileHttpResult>> GetItemPictu
return TypedResults.PhysicalFile(path, contentType, lastModified: lastModified);
}

public static async Task<Results<BadRequest<string>, RedirectToRouteHttpResult, Ok<PaginatedItems<CatalogItem>>>> GetItemsBySemanticRelevance(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
string text)
{
return await GetItemsByName(paginationRequest, services, text);
}

public static async Task<Ok<PaginatedItems<CatalogItem>>> GetItemsByBrandAndTypeId(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
Expand Down
6 changes: 0 additions & 6 deletions labs/2-Create-Blazor-Frontend/src/Catalog.API/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
"Version": "v1"
}
},
"ConnectionStrings": {
"EventBus": "amqp://localhost"
},
"EventBus": {
"SubscriptionClientName": "Catalog"
},
"CatalogOptions": {
"PicBasePathFormat": "items/{0}/pic/"
}
Expand Down
3 changes: 0 additions & 3 deletions labs/2-Create-Blazor-Frontend/src/WebApp/WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<Nullable>enable</Nullable>
<RootNamespace>eShop.WebApp</RootNamespace>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>

<!-- Disable RZ10021, which is failing due to a Razor bug, according to Mackinnon. -->
<NoWarn>$(NoWarn);RZ10021</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions labs/2-Create-Blazor-Frontend/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0-preview.3.24105.21" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
</ItemGroup>
</Project>
8 changes: 0 additions & 8 deletions labs/3-Add-Identity/end/Catalog.API/Apis/CatalogApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@ public static async Task<Results<NotFound, PhysicalFileHttpResult>> GetItemPictu
return TypedResults.PhysicalFile(path, contentType, lastModified: lastModified);
}

public static async Task<Results<BadRequest<string>, RedirectToRouteHttpResult, Ok<PaginatedItems<CatalogItem>>>> GetItemsBySemanticRelevance(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
string text)
{
return await GetItemsByName(paginationRequest, services, text);
}

public static async Task<Ok<PaginatedItems<CatalogItem>>> GetItemsByBrandAndTypeId(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
Expand Down
6 changes: 0 additions & 6 deletions labs/3-Add-Identity/end/Catalog.API/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
"Version": "v1"
}
},
"ConnectionStrings": {
"EventBus": "amqp://localhost"
},
"EventBus": {
"SubscriptionClientName": "Catalog"
},
"CatalogOptions": {
"PicBasePathFormat": "items/{0}/pic/"
}
Expand Down
16 changes: 0 additions & 16 deletions labs/3-Add-Identity/end/WebApp/Extensions/NavigationManagerExtensions.cs
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions labs/3-Add-Identity/end/WebApp/WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<Nullable>enable</Nullable>
<RootNamespace>eShop.WebApp</RootNamespace>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>

<!-- Disable RZ10021, which is failing due to a Razor bug, according to Mackinnon. -->
<NoWarn>$(NoWarn);RZ10021</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,8 +17,4 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
<Protobuf Include="..\Basket.API\Proto\basket.proto" GrpcServices="Client" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion labs/3-Add-Identity/end/eShop.ServiceDefaults/AuthenticationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static Uri ResolveIdpAuthorityUri(this ServiceEndPointResolverRegistry re
{
// Sync over async :(
var idpBaseUrl = resolver.ResolveEndPointUrlAsync(serviceName).AsTask().GetAwaiter().GetResult()
?? throw new InvalidOperationException($"Could not resolve IDP address using service name '{serviceName}'.");
?? throw new InvalidOperationException($"Could not resolve IdP address using service name '{serviceName}'.");
var identityUri = GetIdpRealmUri(new Uri(idpBaseUrl), configuration);

return identityUri;
Expand Down
12 changes: 6 additions & 6 deletions labs/3-Add-Identity/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0-preview.3.24105.21" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
</ItemGroup>
</Project>
8 changes: 0 additions & 8 deletions labs/3-Add-Identity/src/Catalog.API/Apis/CatalogApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@ public static async Task<Results<NotFound, PhysicalFileHttpResult>> GetItemPictu
return TypedResults.PhysicalFile(path, contentType, lastModified: lastModified);
}

public static async Task<Results<BadRequest<string>, RedirectToRouteHttpResult, Ok<PaginatedItems<CatalogItem>>>> GetItemsBySemanticRelevance(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
string text)
{
return await GetItemsByName(paginationRequest, services, text);
}

public static async Task<Ok<PaginatedItems<CatalogItem>>> GetItemsByBrandAndTypeId(
[AsParameters] PaginationRequest paginationRequest,
[AsParameters] CatalogServices services,
Expand Down
6 changes: 0 additions & 6 deletions labs/3-Add-Identity/src/Catalog.API/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
"Version": "v1"
}
},
"ConnectionStrings": {
"EventBus": "amqp://localhost"
},
"EventBus": {
"SubscriptionClientName": "Catalog"
},
"CatalogOptions": {
"PicBasePathFormat": "items/{0}/pic/"
}
Expand Down
16 changes: 0 additions & 16 deletions labs/3-Add-Identity/src/WebApp/Extensions/NavigationManagerExtensions.cs
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions labs/3-Add-Identity/src/WebApp/WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<Nullable>enable</Nullable>
<RootNamespace>eShop.WebApp</RootNamespace>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>

<!-- Disable RZ10021, which is failing due to a Razor bug, according to Mackinnon. -->
<NoWarn>$(NoWarn);RZ10021</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand All @@ -19,8 +16,4 @@
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.0-preview.3.24105.21" />
</ItemGroup>

<ItemGroup>
<Protobuf Include="..\Basket.API\Proto\basket.proto" GrpcServices="Client" />
</ItemGroup>

</Project>
3 changes: 0 additions & 3 deletions labs/3-Add-Identity/src/WebApp/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
}
},
"AllowedHosts": "*",
"EventBus": {
"SubscriptionClientName": "Ordering.webapp"
},
"SessionCookieLifetimeMinutes": 60,
"Identity": {
"Enabled": true
Expand Down
2 changes: 1 addition & 1 deletion labs/3-Add-Identity/src/eShop.ServiceDefaults/AuthenticationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static Uri ResolveIdpAuthorityUri(this ServiceEndPointResolverRegistry re
{
// Sync over async :(
var idpBaseUrl = resolver.ResolveEndPointUrlAsync(serviceName).AsTask().GetAwaiter().GetResult()
?? throw new InvalidOperationException($"Could not resolve IDP address using service name '{serviceName}'.");
?? throw new InvalidOperationException($"Could not resolve IdP address using service name '{serviceName}'.");
var identityUri = GetIdpRealmUri(new Uri(idpBaseUrl), configuration);

return identityUri;
Expand Down
12 changes: 6 additions & 6 deletions labs/3-Add-Identity/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0-preview.3.24105.21" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
</ItemGroup>
</Project>
Loading
Loading