Important update to DAB toolkit, fixed a few things, updated many #1138
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,33 @@ | ||
| var builder = DistributedApplication.CreateBuilder(args); | ||
|
|
||
| var sqlScript = File.ReadAllText("./sql-server.sql"); | ||
|
|
||
| var sqlDatabase = builder | ||
| .AddSqlServer("sql") | ||
| .WithDataVolume("trek-sql-data") | ||
| .AddDatabase("trek") | ||
JerryNixon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .WithCreationScript(sqlScript); | ||
|
|
||
| var dabConfig = new FileInfo("./dab-config.json"); | ||
|
|
||
| var dab = builder.AddDataAPIBuilder("dab") | ||
| .WithImageTag("1.7.86-rc") | ||
| .WithConfigFile(dabConfig) | ||
| .WaitFor(sqlDatabase) | ||
| .WithReference(sqlDatabase); | ||
|
|
||
| var mcp = builder | ||
| .AddMcpInspector("mcp-inspector", options => | ||
| { | ||
| options.InspectorVersion = "0.20.0"; | ||
| }) | ||
| .WithMcpServer(dab, transportType: McpTransportType.StreamableHttp) | ||
| .WithParentRelationship(dab) | ||
| .WithEnvironment("DANGEROUSLY_OMIT_AUTH", "true") | ||
| .WaitFor(dab); | ||
|
|
||
| builder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_Azure_DataApiBuilder_BlazorApp>("blazorApp") | ||
| .WithReference(dab) | ||
| .WaitFor(dab); | ||
|
|
||
| builder.Build().Run(); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // This file is used by Code Analysis to maintain SuppressMessage | ||
| // attributes that are applied to this project. | ||
| // Project-level suppressions either have no target or are given | ||
| // a specific target and scoped to a namespace, type, member, etc. | ||
|
|
||
| using System.Diagnostics.CodeAnalysis; | ||
|
|
||
| [assembly: SuppressMessage("Performance", "CA1873:Avoid potentially expensive logging", Justification = "The additional allocation cost from logging in TrekApiClient.GetSeriesAsync is acceptable for this sample Blazor application and simplifies the example code.", Scope = "member", Target = "~M:CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.BlazorApp.TrekApiClient.GetSeriesAsync~System.Threading.Tasks.Task{System.Collections.Generic.List{CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.BlazorApp.Series}}")] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,56 @@ | ||
| using System.Text.Json.Serialization; | ||
|
|
||
| namespace CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.BlazorApp; | ||
|
|
||
| public class TrekApiClient(HttpClient httpClient, ILogger<TrekApiClient> logger) | ||
| { | ||
| public async Task<List<Series>> GetSeriesAsync() | ||
| { | ||
| var response = await httpClient.GetAsync($"api/series"); | ||
| response.EnsureSuccessStatusCode(); | ||
| var result = await response.Content.ReadFromJsonAsync<DabResponse<Series>>(); | ||
|
|
||
| if(result is null) | ||
| { | ||
| logger.LogError("Failed to deserialize response from Data API Builder."); | ||
| throw new Exception("Failed to deserialize response from Data API Builder."); | ||
| } | ||
|
|
||
| if (result.Error is not null) | ||
| { | ||
| logger.LogError("API error: {Code} - {Message}", result.Error.Code, result.Error.Message); | ||
| throw new Exception($"{result.Error.Code}: {result.Error.Message}"); | ||
| } | ||
JerryNixon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| return result.Value ?? []; | ||
| } | ||
| } | ||
|
|
||
| public class DabResponse<T> | ||
| { | ||
| [JsonPropertyName("value")] | ||
| public List<T>? Value { get; set; } | ||
|
|
||
| [JsonPropertyName("nextLink")] | ||
| public string? NextLink { get; set; } | ||
|
|
||
| [JsonPropertyName("error")] | ||
| public DabError? Error { get; set; } | ||
| } | ||
|
|
||
| public class DabError | ||
| { | ||
| [JsonPropertyName("code")] | ||
| public string Code { get; set; } = string.Empty; | ||
|
|
||
| [JsonPropertyName("message")] | ||
| public string Message { get; set; } = string.Empty; | ||
|
|
||
| [JsonPropertyName("status")] | ||
| public int Status { get; set; } | ||
| } | ||
|
|
||
| public class Series | ||
| { | ||
| public required string Name { get; set; } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,6 @@ | |
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Aspire.Hosting" /> | ||
|
|
||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,16 @@ | ||
| namespace CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder; | ||
|
|
||
| /// <summary> | ||
| /// Container image tags for the Data API Builder container. | ||
| /// </summary> | ||
| internal static class DataApiBuilderContainerImageTags | ||
| { | ||
| /// <summary>The container registry.</summary> | ||
| public const string Registry = "mcr.microsoft.com"; | ||
|
|
||
| /// <summary>The container image name.</summary> | ||
| public const string Image = "azure-databases/data-api-builder"; | ||
|
|
||
| /// <summary>The default container image tag.</summary> | ||
| public const string Tag = "1.6.87"; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,21 @@ | ||
| namespace Aspire.Hosting.ApplicationModel; | ||
|
|
||
| /// <summary> | ||
| /// A resource that represents Data API Builder. | ||
| /// </summary> | ||
| /// <param name="name">The name of the resource.</param> | ||
| /// <param name="entrypoint">An optional container entrypoint.</param> | ||
| public sealed class DataApiBuilderContainerResource(string name, string? entrypoint = null) | ||
| : ContainerResource(name, entrypoint), IResourceWithServiceDiscovery | ||
| { | ||
| internal const string HttpEndpointName = "http"; | ||
|
|
||
| internal const int HttpEndpointPort = 5000; | ||
tommasodotNET marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| private EndpointReference? _primaryEndpoint; | ||
|
|
||
| /// <summary> | ||
| /// Gets the primary HTTP endpoint for the Data API Builder container. | ||
| /// </summary> | ||
| public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, HttpEndpointName); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's revert this change as we should keep them all in sync and we haven't had time to update everything else.