Skip to content

Fix Azure Storage RunAsEmulator#5084

Merged
radical merged 3 commits intomicrosoft:mainfrom
radical:storage-test
Jul 26, 2024
Merged

Fix Azure Storage RunAsEmulator#5084
radical merged 3 commits intomicrosoft:mainfrom
radical:storage-test

Conversation

@radical
Copy link
Copy Markdown
Member

@radical radical commented Jul 26, 2024 •
edited
Loading

And add a test for the same.

Fixes #5078.

Microsoft Reviewers: Open in CodeFlow

@radical radical requested review from eerhardt and sebastienros July 26, 2024 05:54
@ghost ghost added the area-codeflow for labeling automated codeflow. intentionally a different color! label Jul 26, 2024
@radical radical requested a review from joperezr July 26, 2024 05:54
mitchdenny
mitchdenny approved these changes Jul 26, 2024
View reviewed changes
eerhardt
eerhardt approved these changes Jul 26, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@eerhardt eerhardt left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks, @radical!

@eerhardt
Copy link
Copy Markdown
Member

eerhardt commented Jul 26, 2024

/backport to release/8.1

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 26, 2024

Started backporting to release/8.1: https://github.com/dotnet/aspire/actions/runs/10112049832

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 26, 2024

@eerhardt backporting to release/8.1 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: [tests] Add AzureStorageEmulatorFunctionalTests
Using index info to reconstruct a base tree...
A	tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj deleted in HEAD and modified in [tests] Add AzureStorageEmulatorFunctionalTests. Version [tests] Add AzureStorageEmulatorFunctionalTests of tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 [tests] Add AzureStorageEmulatorFunctionalTests
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 26, 2024

@eerhardt an error occurred while backporting to release/8.1, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@eerhardt eerhardt mentioned this pull request Jul 26, 2024
Closed
@build-analysis build-analysis bot mentioned this pull request Jul 26, 2024
Closed
3 tasks
@radical radical merged commit 8b603ea into microsoft:main Jul 26, 2024
radical
radical commented Jul 26, 2024
View reviewed changes
tests/Aspire.Hosting.Azure.Tests/AzureStorageEmulatorFunctionalTests.cs
Comment on lines +35 to +41
var blobContainer = (await serviceClient.CreateBlobContainerAsync("container")).Value;
var blobClient = blobContainer.GetBlobClient("testKey");

await blobClient.UploadAsync(BinaryData.FromString("testValue"));

var downloadResult = (await blobClient.DownloadContentAsync()).Value;
Assert.Equal("testValue", downloadResult.Content.ToString());
Copy link
Copy Markdown
Member Author

@radical radical Jul 26, 2024

Choose a reason for hiding this comment

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

better test :) 👍

radical added a commit to radical/aspire that referenced this pull request Jul 30, 2024
@radical
Squashed commit of the following:
40fcefa 
commit c680699
Merge: 9e48bf0 8b603ea
Author: Ankit Jain <radical@gmail.com>
Date:   Fri Jul 26 18:14:38 2024 -0400

    Merge remote-tracking branch 'origin/main' into playground-tests-prep

commit 9e48bf0
Author: Ankit Jain <radical@gmail.com>
Date:   Fri Jul 26 18:14:29 2024 -0400

    Fix up import conditions

commit b1726a2
Author: Ankit Jain <radical@gmail.com>
Date:   Fri Jul 26 17:54:59 2024 -0400

    Update Aspire.sln to track the project name changes

commit 8b603ea
Author: Ankit Jain <radical@gmail.com>
Date:   Fri Jul 26 14:57:19 2024 -0400

    Fix Azure Storage `RunAsEmulator` (microsoft#5084)

    * [tests] Add AzureStorageEmulatorFunctionalTests

    * Bump azurite from 3.30.0 to 3.31.0

    Issue: microsoft#5078

    * Address PR feedback

    ---------

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

commit bc27dba
Author: Ankit Jain <radical@gmail.com>
Date:   Thu Jul 25 18:20:53 2024 -0400

    [playground] Update all ProjectReferences to AspireProjectOrPackageReference. And skip Dashboard.csproj when building for testing

commit 13a1550
Author: Ankit Jain <radical@gmail.com>
Date:   Thu Jul 25 17:26:42 2024 -0400

    [playground] Add top level Directory.Build.{props,targets}

    And use Aspire.RepoTesting.* to allow testing and this replaces the
    per-project sdk imports.

commit 6d84aee
Author: Ankit Jain <radical@gmail.com>
Date:   Thu Jul 25 17:31:49 2024 -0400

    [playground] Rename AppHost projects to be named consistently

    .. with `.AppHost` suffix. `Aspire.Hosting.Testing` specifically looks
    for a `.AppHost` suffix to identify apphost assemblies.

commit 2a2e2b9
Author: Ankit Jain <radical@gmail.com>
Date:   Thu Jul 25 17:27:06 2024 -0400

    [playground] remove all the per-project Directory.Build.{props,targets}

# Conflicts:
#	playground/Directory.Build.props
#	playground/Directory.Build.targets
#	playground/dapr/AppHost/DaprAppHost.csproj
#	playground/dapr/AppHost/Program.cs
#	playground/dapr/AppHost/Properties/launchSettings.json
#	playground/dapr/AppHost/aspire-manifest.json
#	playground/dapr/Dapr.AppHost/Dapr.AppHost.csproj
#	playground/dapr/Dapr.AppHost/Program.cs
#	playground/dapr/Dapr.AppHost/Properties/launchSettings.json
#	playground/dapr/Dapr.AppHost/appsettings.json
#	playground/dapr/Dapr.AppHost/aspire-manifest.json
#	playground/dapr/dapr.AppHost/Dapr.AppHost.csproj
#	playground/dapr/dapr.AppHost/Program.cs
#	playground/dapr/dapr.AppHost/Properties/launchSettings.json
#	playground/dapr/dapr.AppHost/appsettings.json
#	playground/dapr/dapr.AppHost/aspire-manifest.json
#	playground/orleans/OrleansAppHost/appsettings.json
@github-actions github-actions bot locked and limited conversation to collaborators Aug 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@mitchdenny mitchdenny mitchdenny approved these changes

@eerhardt eerhardt eerhardt approved these changes

@sebastienros sebastienros Awaiting requested review from sebastienros

@joperezr joperezr Awaiting requested review from joperezr

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Azure Storage component doesn't work with Azure Storage RunAsEmulator

3 participants

@radical @eerhardt @mitchdenny