Naming Convention: Refactors AddAzureCosmosClient and AddKeyedAzureCosmosClient API Names#3906
Merged
kundadebdatta merged 4 commits intomicrosoft:mainfrom Apr 24, 2024
Merged
Conversation
ghost
added
the
area-integrations
eerhardt
reviewed
Apr 24, 2024
eerhardt
reviewed
Apr 24, 2024
Member
|
@kundadebdatta - We should be updating all the runtime component APIs to be consistent. I did this in 5b7de51, if you want to pull it into your PR. I was unable to push to your branch (I think because you are using |
kirankumarkolli
approved these changes
Apr 24, 2024
Pilchie
approved these changes
Apr 24, 2024
eerhardt
approved these changes
Apr 24, 2024
Member
|
/backport to /release/8.0 |
Contributor
|
Started backporting to /release/8.0: https://github.com/dotnet/aspire/actions/runs/8823332798 |
Contributor
|
@eerhardt an error occurred while backporting to /release/8.0, please check the run log for details! Error: The specified backport target branch /release/8.0 wasn't found in the repo. |
Member
|
/backport to release/8.0 |
Contributor
|
Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8823346537 |
Contributor
|
@eerhardt backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Code changes to refactor API names. Replaced delimeter to /
Using index info to reconstruct a base tree...
M src/Aspire.Hosting.Azure.CosmosDB/README.md
M src/Components/Aspire.Microsoft.Azure.Cosmos/AspireMicrosoftAzureCosmosDBExtensions.cs
A src/Components/Aspire.Microsoft.Azure.Cosmos/PublicAPI.Unshipped.txt
M src/Components/Aspire.Microsoft.Azure.Cosmos/README.md
M tests/Aspire.Microsoft.Azure.Cosmos.Tests/ConformanceTests.cs
Falling back to patching base and 3-way merge...
Auto-merging tests/Aspire.Microsoft.Azure.Cosmos.Tests/ConformanceTests.cs
CONFLICT (content): Merge conflict in tests/Aspire.Microsoft.Azure.Cosmos.Tests/ConformanceTests.cs
Auto-merging src/Components/Aspire.Microsoft.Azure.Cosmos/README.md
CONFLICT (content): Merge conflict in src/Components/Aspire.Microsoft.Azure.Cosmos/README.md
CONFLICT (modify/delete): src/Components/Aspire.Microsoft.Azure.Cosmos/PublicAPI.Unshipped.txt deleted in HEAD and modified in Code changes to refactor API names. Replaced delimeter to /. Version Code changes to refactor API names. Replaced delimeter to / of src/Components/Aspire.Microsoft.Azure.Cosmos/PublicAPI.Unshipped.txt left in tree.
Auto-merging src/Components/Aspire.Microsoft.Azure.Cosmos/AspireMicrosoftAzureCosmosDBExtensions.cs
CONFLICT (content): Merge conflict in src/Components/Aspire.Microsoft.Azure.Cosmos/AspireMicrosoftAzureCosmosDBExtensions.cs
Auto-merging src/Aspire.Hosting.Azure.CosmosDB/README.md
CONFLICT (content): Merge conflict in src/Aspire.Hosting.Azure.CosmosDB/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Code changes to refactor API names. Replaced delimeter to /
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@eerhardt an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
This was referenced Apr 24, 2024
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
AddAzureCosmosClientandAddKeyedAzureCosmosClientAPI Names/delimiter for cosmos user agent, instead of|Microsoft Reviewers: Open in CodeFlow