Skip to content

Fix Azure ServiceBus persistent container support#7136

Merged
sebastienros merged 23 commits intomainfrom
sebros/sbpersist
Feb 5, 2025
Merged

Fix Azure ServiceBus persistent container support#7136
sebastienros merged 23 commits intomainfrom
sebros/sbpersist

Conversation

@sebastienros
Copy link
Copy Markdown
Contributor

@sebastienros sebastienros commented Jan 17, 2025 •
edited
Loading

Description

Fixes #7071

Issues identified:

  • the lifetime is not forwarded to the dependent container (sqledge)
  • the password was new on every start, invalidating reusability
  • the volume was using a new folder on every start, invalidating reusability

Now the password and the folder are stored in user secrets and reused.

Checklist

  • Is this feature complete?
    • Yes. Ready to ship.
    • No. Follow-up changes expected.
  • Are you including unit tests for the changes and scenario tests if relevant?
    • Yes
    • No
  • Did you add public API?
    • Yes
      • If yes, did you have an API Review for it?
        • Yes
        • No
      • Did you add <remarks /> and <code /> elements on your triple slash comments?
        • Yes
        • No
    • No
  • Does the change make any security assumptions or guarantees?
    • Yes
      • If yes, have you done a threat model and had a security review?
        • Yes
        • No
    • No
  • Does the change require an update in our Aspire docs?

davidfowl
davidfowl reviewed Jan 17, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs Outdated
davidfowl
davidfowl reviewed Jan 17, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs Outdated
This was referenced Jan 18, 2025
Closed
Open
@davidfowl
Copy link
Copy Markdown
Contributor

davidfowl commented Jan 18, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Jan 18, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@davidfowl
Copy link
Copy Markdown
Contributor

davidfowl commented Jan 18, 2025

AddAzureServiceBusWithEmulatorGetsExpectedPort - actual failing test

@sebastienros sebastienros marked this pull request as ready for review January 22, 2025 20:43
@sebastienros sebastienros requested a review from eerhardt January 23, 2025 00:12
davidfowl
davidfowl reviewed Jan 23, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs Outdated
eerhardt
eerhardt reviewed Jan 23, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/ParameterResourceBuilderExtensions.cs Outdated
Comment thread src/Aspire.Hosting/ParameterResourceBuilderExtensions.cs Outdated
Comment thread src/Aspire.Hosting.Azure.ServiceBus/Aspire.Hosting.Azure.ServiceBus.csproj Outdated
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs Outdated
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs Outdated
@danmoseley danmoseley requested a review from Copilot January 27, 2025 19:23
eerhardt
eerhardt reviewed Jan 29, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs Outdated
eerhardt
eerhardt reviewed Jan 29, 2025
View reviewed changes
Comment thread src/Shared/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Jan 29, 2025
View reviewed changes
Comment thread src/Shared/SecretsStore.cs Outdated
sebastienros and others added 5 commits January 29, 2025 12:42
@sebastienros
Add tests
d929346
@sebastienros @eerhardt
Update src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs
fcb23e7 
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
@sebastienros
Use /obj folder to store files
d031cd2
@sebastienros
Create ResourcesPreparingEvent
376fcca
@sebastienros
Merge remote-tracking branch 'origin/main' into sebros/sbpersist
5620c61 
# Conflicts:
#	src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs
#	src/Aspire.Hosting/PublicAPI.Unshipped.txt
davidfowl
davidfowl reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
/// </summary>
/// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
/// <returns>A new instance of <see cref="AspireStore"/>.</returns>
public static AspireStore Create(IDistributedApplicationBuilder builder)
Copy link
Copy Markdown
Contributor

@davidfowl davidfowl Feb 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a weird API. Can we make this internal and instead expose something on the builder? (ext method). I guess we can do that later in review.

davidfowl
davidfowl reviewed Feb 4, 2025
View reviewed changes
Comment thread tests/Aspire.Hosting.Azure.Tests/AzureServiceBusExtensionsTests.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStore.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/AspireStoreExtensions.cs
/// </summary>
/// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
/// <returns>The <see cref="IAspireStore"/>.</returns>
public static IAspireStore CreateStore(this IDistributedApplicationBuilder builder)
Copy link
Copy Markdown
Member

@eerhardt eerhardt Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we can iterate on this API, so we don't have to block on this, but I think this is going to clutter up normal dev's intellisense. Normal apphost devs don't need to use this API, so I don't think it should be top-level like "AddContainer" or "AddPostgres", etc.

Copy link
Copy Markdown
Contributor Author

@sebastienros sebastienros Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok to move to Azure.Hosting.ApplicationModel instead?

eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting.Testing/DistributedApplicationTestingBuilder.cs Outdated
eerhardt
eerhardt reviewed Feb 4, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/IAspireStore.cs Outdated
eerhardt
eerhardt approved these changes Feb 5, 2025
View reviewed changes
Comment thread src/Aspire.Hosting/IAspireStore.cs
/// </summary>
/// <remarks>
/// The store is created in the ./obj folder of the Application Host.
/// If the ASPIRE_STORE_DIR environment variable is set this will be used instead.
Copy link
Copy Markdown
Member

@eerhardt eerhardt Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// If the ASPIRE_STORE_DIR environment variable is set this will be used instead.
/// If the ASPIRE__STORE__PATH environment variable is set this will be used instead.

Comment thread src/Aspire.Hosting/IAspireStore.cs
/// If the ASPIRE_STORE_DIR environment variable is set this will be used instead.
///
/// The store is specific to a <see cref="IDistributedApplicationBuilder"/> instance such that each application can't
/// conflict with others. A <em>.aspire</em> prefix is also used to ensure that the folder can be delete without impacting
Copy link
Copy Markdown
Member

@eerhardt eerhardt Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// conflict with others. A <em>.aspire</em> prefix is also used to ensure that the folder can be delete without impacting
/// conflict with others. A <em>.aspire</em> prefix is also used to ensure that the folder can be deleted without impacting

@sebastienros sebastienros merged commit 4e9896b into main Feb 5, 2025
@sebastienros sebastienros deleted the sebros/sbpersist branch February 5, 2025 20:07
@eerhardt eerhardt mentioned this pull request Feb 18, 2025
Closed
16 tasks
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 8, 2025
@github-actions github-actions Bot added the area-app-model Issues pertaining to the APIs in Aspire.Hosting, e.g. DistributedApplication label Mar 10, 2025
@sebastienros sebastienros review requested due to automatic review settings March 23, 2026 20:15
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@davidfowl davidfowl davidfowl left review comments

@eerhardt eerhardt eerhardt approved these changes

@mitchdenny mitchdenny Awaiting requested review from mitchdenny mitchdenny is a code owner

@ReubenBond ReubenBond Awaiting requested review from ReubenBond

Assignees

No one assigned

Labels

area-app-model Issues pertaining to the APIs in Aspire.Hosting, e.g. DistributedApplication

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

The service bus emulator is never persistent when marked as such

3 participants

@sebastienros @davidfowl @eerhardt