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.

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

Dapr migration initial import #378

Merged
merged 5 commits into from
Jan 15, 2025

Conversation

aaronpowell
Copy link
Member

@aaronpowell aaronpowell commented Jan 10, 2025

First bit of work on #375 (and subsequently dotnet/aspire#7049).

Brought across all the code from the Aspire repo, and got it to compile.

Added the tests from the Aspire repo, but had to remove the DaprSchemaTests file as we can't do schema tests (missing a lot of infrastructure from the Aspire repo). Had to edit the DaprTests to not use EnvironmentVariableEvaluator, which we can't leverage as it uses some internal types from Aspire.Hosting. This means that our testing of the environment variables is slightly different, and the values we assert against are not the docker internal host endpoints, but the public endpoints.

Had to remove the DaprSchemaTests file as we can't do schema tests (missing a lot of infrastructure from the Aspire repo).

Had to edit the DaprTests to not use EnvironmentVariableEvaluator, which we can't leverage as it uses some internal types from Aspire.Hosting. This means that our testing of the environment variables is slightly different, and the values we assert against are not the docker internal host endpoints, but the public endpoints
Copy link

Code Coverage

Package Line Rate Branch Rate Complexity Health
CommunityToolkit.Aspire.EventStore 100% 100% 46
CommunityToolkit.Aspire.Hosting.ActiveMQ 60% 24% 104
CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit 1% 0% 14
CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder 100% 100% 22
CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps 100% 100% 28
CommunityToolkit.Aspire.Hosting.Bun 81% 71% 54
CommunityToolkit.Aspire.Hosting.Dapr 51% 49% 536
CommunityToolkit.Aspire.Hosting.Deno 84% 75% 72
CommunityToolkit.Aspire.Hosting.EventStore 90% 71% 62
CommunityToolkit.Aspire.Hosting.Golang 94% 50% 16
CommunityToolkit.Aspire.Hosting.Java 98% 71% 58
CommunityToolkit.Aspire.Hosting.Meilisearch 61% 27% 94
CommunityToolkit.Aspire.Hosting.Ngrok 59% 50% 58
CommunityToolkit.Aspire.Hosting.NodeJS.Extensions 90% 68% 92
CommunityToolkit.Aspire.Hosting.Ollama 65% 64% 198
CommunityToolkit.Aspire.Hosting.Python.Extensions 67% 46% 56
CommunityToolkit.Aspire.Hosting.Rust 94% 83% 16
CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects 75% 61% 96
CommunityToolkit.Aspire.MassTransit.RabbitMQ 100% 100% 30
CommunityToolkit.Aspire.Meilisearch 97% 92% 68
CommunityToolkit.Aspire.OllamaSharp 87% 82% 68
Summary 70% (2969 / 4256) 57% (892 / 1556) 1788

Minimum allowed line rate is 60%

@aaronpowell aaronpowell merged commit 79ada15 into dapr-migration Jan 15, 2025
8 checks passed
@aaronpowell aaronpowell deleted the dapr-migration-initial-import branch January 15, 2025 01:00
aaronpowell added a commit that referenced this pull request Jan 15, 2025
* Dropping files from Aspire repo

* Moving to the right namespace/folder naming

* Adding to solution and getting it to compile

* Adding in the Dapr tests from the Aspire repo

Had to remove the DaprSchemaTests file as we can't do schema tests (missing a lot of infrastructure from the Aspire repo).

Had to edit the DaprTests to not use EnvironmentVariableEvaluator, which we can't leverage as it uses some internal types from Aspire.Hosting. This means that our testing of the environment variables is slightly different, and the values we assert against are not the docker internal host endpoints, but the public endpoints
aaronpowell added a commit that referenced this pull request Jan 31, 2025
* Dapr migration initial import (#378)

* Dropping files from Aspire repo

* Moving to the right namespace/folder naming

* Adding to solution and getting it to compile

* Adding in the Dapr tests from the Aspire repo

Had to remove the DaprSchemaTests file as we can't do schema tests (missing a lot of infrastructure from the Aspire repo).

Had to edit the DaprTests to not use EnvironmentVariableEvaluator, which we can't leverage as it uses some internal types from Aspire.Hosting. This means that our testing of the environment variables is slightly different, and the values we assert against are not the docker internal host endpoints, but the public endpoints

* Dapr azure hosting ext (#371)

* Create Dap Azure extensions project
Create Dapr Azure Redis project
Create Example AppHost + ApiService

* Work in progress
Create Dapr resource for provisioning

* Remove specific resource as not generating properly
Use AddAzureInfrastructure

* Updated to use secret refs

* Fix - Remove code used for testing
Add AzureDaprComponentResource
Start of unit tests

* Unit tests +
Fixes based on unit tests

* remove bicep file

* Tests for AzureRedis

* Add Readme and perform small cleanup tasks

* Update src/CommunityToolkit.Aspire.Hosting.Dapr.AzureExtensions/ApplicationModel/AzureDaprComponentResource.cs

Co-authored-by: Aaron Powell <[email protected]>

* Apply suggestions from code review

Co-authored-by: Aaron Powell <[email protected]>

* Revert unintentional change to Java.AppHost

* Update tests/CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.Tests/ResourceCreationTests.cs

Co-authored-by: Aaron Powell <[email protected]>

* Updated azure redis documentation also added missing xmldocs for api

* correct unit test approach

* remove unnecessary comment

* null checking

* More null checking

* Update Azure redis readme

* Update AzureExtension readme

* move extensions to shared files
remove Dapr Azure extensions project
make dapr azure extensions internal
include extensions in dapr redis package
include extensions in dapr extensions tests
make dapr redis internals visible to dapr redis tests

* change redisCache to infra rename source to redisBuilder

---------

Co-authored-by: Aaron Powell <[email protected]>

* Fixing broken sln

* Dapr example and tests (#394)

* Migrating sample from dotnet/aspire repo

* Adding dapr tests

* Adding dapr setup to CI workflow

* Following the setup-dapr instructions

* Debugging CI

* Falling back to looking at PATH

* Fixing line endings replacement

* Added PATH lookup to Windows

* Adding some diagnostic info

* Changing log level

* init was only running on linux, which I think is wrong

* Turning up logging

* Bypass logging

* Interpolated strings

* Adding resource logger service

* Java app build extension (#348)

* Adding the ability to do a maven build in the app host

This uses an event to run the mvnw build (or it can be customised via options), so it is only used when the app host is running the resource

Fixes #339

* Adding a 'build with maven' command

Allows you to rebuild the java app without having to restart the whole app host.

* Expanding test coverage

* Some more tests

* Windows exe needs a file extension

* Rolling back some changes

* Renaming step

* Tidying up the tests

* Requiring docker for dapr tests

* Adding codeowners

* Moving dapr extensions to use our dapr package

* Forgot to update the tests project

* Adding some assembly filters

* Adding readme updates

* Slight break in the markdown

---------

Co-authored-by: Brett Smith <[email protected]>
@Alirexaa Alirexaa added this to the 9.2 milestone Feb 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants