Skip to content

[automated] Merge branch 'release/8.0' => 'main'#4396

Merged
joperezr merged 189 commits intomicrosoft:mainfrom
dotnet-maestro-bot:merge/release/8.0-to-main
Jun 6, 2024
Merged

[automated] Merge branch 'release/8.0' => 'main'#4396
joperezr merged 189 commits intomicrosoft:mainfrom
dotnet-maestro-bot:merge/release/8.0-to-main

Conversation

@dotnet-maestro-bot
Copy link
Copy Markdown

@dotnet-maestro-bot dotnet-maestro-bot commented Jun 5, 2024

I detected changes in the release/8.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/8.0 by the following committers:

  • joperezr
  • github-actions[bot]
  • eerhardt
  • DamianEdwards
  • mitchdenny
  • danegsta
  • radical
  • sebastienros
  • JamesNK
  • davidfowl
  • danmoseley
  • karolz-ms
  • drewnoakes
  • tlmii
  • adamint
  • RussKie
  • invalid-email-address
  • ReubenBond

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/8.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/aspire HEAD:merge/release/8.0-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/aspire HEAD:merge/release/8.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0-to-main main
git pull https://github.com/dotnet-maestro-bot/aspire merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/aspire HEAD:merge/release/8.0-to-main
or if you are using SSH
git checkout -b merge/release/8.0-to-main main
git pull git@github.com:dotnet-maestro-bot/aspire merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/aspire HEAD:merge/release/8.0-to-main

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Microsoft Reviewers: Open in CodeFlow

joperezr and others added 30 commits March 25, 2024 21:33
… IDE protocol version, so use the old protocol until then. (microsoft#3183)

Co-authored-by: David Fowler <davidfowl@gmail.com>
…crosoft#3167)

* Retry reading kubeconfig.


---------

Co-authored-by: Mitch Denny <midenn@microsoft.com>
…ble persistent storage (microsoft#3152) (microsoft#3186)

* Use stable node name for RabbitMQ resources
* Update TestShop to use durable messages

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
…use virtualization (microsoft#3178)

* Refactor console logs to render on server and use virtualization

* Fix tests

* Dashboard line record

* PR feedback

* PR feedback

* Fix console scrolling issue

---------

Co-authored-by: James Newton-King <james@newtonking.com>
…d options, support primary/secondary API keys and rotation (microsoft#3179)

* Change OTLP API key auth to use primary/secondary keys and support rotation

* Merge

* Match Kestrel HTTPS

* PR feedback

* PR feedback

---------

Co-authored-by: James Newton-King <james@newtonking.com>
* API review feedback & general cleanup including removal of currently unused features

* Align namespaces

* Hide more of the API, rename for consistency

* Hide more, rename more

* ResolutionStatus does not need to be equatable

* Make ServiceEndPointQuery public to break InternalsVisibleTo with Dns provider

* Break InternalsVisibleTo from ServiceDiscovery package to YARP by adding a middleware factory

* Remove ResolutionStatus, simplifying Service Discovery interfaces

* Clean up ServiceEndPointImpl

* Mark ServiceEndPointResolverResult as internal

* Remove unnecessary members from ServiceEndPointCollection/Source

* Seal service discovery types

* Remove IServiceEndPointSelectorFactory and use DI instead

* Remove unused endpoint selectors

* Remove unused PendingStatusRefreshPeriod option

* Rename UseServiceDiscovery to AddServiceDiscovery

* Remove possible ambiguity in AddConfigurationServiceEndPointResolver signature

* Add configuration delegate overloads to AddServiceDiscovery methods

* Clean up logging in configuration-based service endpoint provider

* API review: rename ServiceEndPointCollectionSource to IServiceEndPointBuilder

* Rename IServiceDiscoveryDelegatingHttpMessageHandlerFactory

* Rename IServiceEndPointProvider.ResolveAsync to PopulateAsync

* Hide IServiceEndPointSelector

* Remove allowedSchemes from ServiceEndPointQuery.TryParse

* Rename ServiceEndPointQuery.Host to .ServiceName

* Fix build

* Review feedback

* nit param rename

* Improve ServiceEndPointQuery.ToString output

* fixup

(cherry picked from commit 23104ee)
…ng (microsoft#3208)

Co-authored-by: Reuben Bond <reuben.bond@gmail.com>
…tation.StackExchangeRedis (microsoft#3198)

* Remove dependency from OpenTelemetry.Instrumentation.StackExchangeRedis

* Fix test builds

* Fix ActivitySourceName

* Undo IsAotCompatible change

* Update suppression comment to match OTel PR.

* Update code sync instruction for AOT

---------

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
microsoft#3190

Co-authored-by: Damian Edwards <damian@damianedwards.com>
…3217)

* Allow cert warnings to bubble out.

* Fix unnecesary namespace.

---------

Co-authored-by: Mitch Denny <midenn@microsoft.com>
microsoft#3211

Co-authored-by: Damian Edwards <damian@damianedwards.com>
* initial commit for event hubs component and resource (non-functional, but skeleton is there)

* corrected roledefinition

* added consumer client (now have producer, consumer and processor components); modified davidfowl's demo EH project to use new resources and components; bugfixes;

* fixes for processor client; updated build props/targets for playground project

* Update AzureEventHubsExtensions.cs

No need to construct this (we recently changed this in the others).

* some minor refactoring of processor client; made playground project more robust

* address review items; automatically generate processor identifier from hub and consumergroup; add more comments; minor refactoring

* Update src/Aspire.Hosting.Azure/Extensions/AzureEventHubsExtensions.cs



* Update src/Aspire.Hosting.Azure/Extensions/AzureEventHubsExtensions.cs



* update EH endpoint references to use eventHubsEndpoint instead of serviceBusEndpoint; beef up processor identifier naming.

* add ability to configure credential for azure provisioner (removed my hack); added first batch of documentation for component; added partitionreceiver component.

* Update src/Components/Aspire.Azure.Messaging.EventHubs/AzureMessagingEventHubsSettings.cs



* remove azure provisioner credential configuration stuff (will go into separate PR)

* address review points; refactor namespace parsing into base eh component

* fix package tags and add new icon to shared

* remove providercredential reference from config

* fix some more errant service bus mentions and regenerate configurationschema

* fix xmlcomment on settings

* remove azure section from sample config

* update components README.md

* delete EH playground readme

* minor edits for clarification

* port ASB connection/namespace tests; rewrite validation logic to be more robust

* Update playground/AspireEventHub/EventHubs.AppHost/EventHubs.AppHost.csproj



* Update playground/AspireEventHub/EventHubsConsumer/EventHubsConsumer.csproj



* Update src/Aspire.Hosting.Azure.EventHubs/Aspire.Hosting.Azure.EventHubs.csproj



* generate aspire manifest etc for EH sample

* moved processor Start code into Execute for worker sample

* fixed another ref to service bus

* refine checkpoint blob container creation logic to avoid unnecessary permission demand if we can

* enhance logic for blob checkpoint container; add BlobContainerName to settings as an option

* persist checkpoints in processor sample for EH

* renamed settings class in tests to match AEH; was ASB.

* Fix Tracing with EventHubs
Update Telemetry and Components Progress docs
Minor cleanup feedback

* refactor EH client settings into individual classes

* Add readme for EH hosting

* Fix build

* Address PR feedback

- Remove unnecessary Directory.Packages.props entry
- Fix ConfigurationSchema.json to match implementation
- StringComparison.Ordinal is unnecessary when looking for a char

---------

Co-authored-by: Oisin Grehan <oising@gmail.com>
Co-authored-by: Mitch Denny <mitchdenny@outlook.com>
Co-authored-by: Jesse Squire <jesse.squire@gmail.com>
microsoft#3218)

* Detect conflgicting settings when using EnrichEF

* Avoid multiple blank lines

* Improve custom implementation detection

* Implement other EF providers

* Implement CosmosDb

* Update tests
microsoft#3190

Co-authored-by: Damian Edwards <damian@damianedwards.com>
… client configuration (microsoft#3231)

* Retry on YamlException when loading Kubernetes client configuration

* Add comment

---------

Co-authored-by: Reuben Bond <reuben.bond@gmail.com>
…icrosoft#3236)

* Fixup Azure packages after splitting

- remove unnecessary dependencies from Hosting.Azure to PostgreSQL, Redis, and SqlServer.

* Rename Aspire.Hosting.Azure.PosgresSQL to use consistent case with the rest of the libraries.

---------

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
)

Co-authored-by: James Newton-King <james@newtonking.com>
…osoft#3246)

* Support custom styles for resource style - Added support for sending custom style to the dashboard via the resource server protocol. - Use this for azure resource to show more descriptive state updates.

* Make style updates a single field in the app model - This avoid reusing old state styles by mistake when changing text - Added KnownResourceStyles

* Fixed proto comments

---------

Co-authored-by: David Fowler <davidfowl@gmail.com>
… management plugin (microsoft#3247)

* Added WithManagementPlugin() for RabbitMQ resource

Fixes microsoft#2067

Co-authored-by: Damian Edwards <damian@damianedwards.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
…resource type is used. (microsoft#3258)

* Automatically AddAzureProviisioning when Azure resource type is used.

* Friendlier errors in dashboard.

* Better error message.

* Revert a change to postgres.

* Add BicepTemplate/BicepTemplateString/AzureConstruct to the test case.

* PR feedback.

* Update terminal state.

---------

Co-authored-by: Mitch Denny <midenn@microsoft.com>
Co-authored-by: Norm Johanson <normj@amazon.com>
…se/8.0-preview5-to-release/8.0

[automated] Merge branch 'release/8.0-preview5' => 'release/8.0'
…ease/8.0-preview5

[release/8.0-preview5] Show https endpoints more consistently
* - In order for tools to better describe multiple endpoints int the manifest, we must include port information. At runtime most of the port information is dynamically generated and thus not described (for anything but containers), that doesn't work well when trying to deploy to various environments. We allocate ports in situations where there are none to match the runtime behavior. (microsoft#3274)

- Change also renames ContainerPort to TargetPort everywhere.
- Added `WithExternalHttpEndpoints` to mark all http and https endpoints as external.

* Apply suggestions from code review

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>

---------

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
eerhardt and others added 23 commits April 30, 2024 10:58
Co-authored-by: Reuben Bond <reuben.bond@gmail.com>
Co-authored-by: ReubenBond <rebond@microsoft.com>
* Start producing stable packages

* Fix build issue due to incorrect handling of stable packages.

* Remove stable suppression now that it is no longer required

* Fix incorrect package versions for helix tests
* Remove Prometheus commented out code that does not work

* Update Extensions.cs

* Update Extensions.cs

* Update src/Aspire.ProjectTemplates/templates/aspire-empty/AspireApplication.1.ServiceDefaults/Extensions.cs

* Update Extensions.cs

* Update Extensions.cs

* Update Extensions.cs

* Apply suggestions from code review

Co-authored-by: James Newton-King <james@newtonking.com>

* Apply suggestions from code review

---------

Co-authored-by: Sam Spencer <54915162+samsp-msft@users.noreply.github.com>
Co-authored-by: James Newton-King <james@newtonking.com>
)

* Remove constraint from templates for 8.0.1

* Fix test dependency versions
@ghost ghost added the area-codeflow for labeling automated codeflow. intentionally a different color! label Jun 5, 2024
@joperezr joperezr self-assigned this Jun 5, 2024
@joperezr
Copy link
Copy Markdown
Member

joperezr commented Jun 5, 2024

I'm taking care of this one.

@joperezr joperezr merged commit e6f4aab into microsoft:main Jun 6, 2024
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflow for labeling automated codeflow. intentionally a different color!

Projects

None yet

Development

Successfully merging this pull request may close these issues.