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

Use federated connections for storage account and apiscan access #6892

Merged
merged 6 commits into from
Jul 2, 2024

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Jun 25, 2024

No description provided.

@mmitche mmitche requested a review from jander-msft June 25, 2024 18:59
@mmitche
Copy link
Member Author

mmitche commented Jun 25, 2024

@jander-msft Can you help with verifying this and backporting? Already launched a compliance pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2482288&view=results.

Other notes:

  • dotnetstage account keys are going away at some point in the near future.
  • Same with the dotnetbuilds variable group, so you will need to backport these changes to older in-support releases.

@mmitche
Copy link
Member Author

mmitche commented Jun 25, 2024

compliance run is working fine with APISCan. I'm going to remove the variable group after this merges.

@jander-msft
Copy link
Member

This appears to not work on the Linux build legs e.g. https://dev.azure.com/dnceng/internal/_build/results?buildId=2482363&view=logs&j=5cee8dfe-76ad-5548-6fb0-db50ffe1c51d&t=a11a0513-7a7e-527c-a490-2b9da3b9540e

I believe the difference is that the Linux build legs are containerized and the container images do not contain pwsh on them.

@mmitche
Copy link
Member Author

mmitche commented Jun 25, 2024

Cool I'll resolve that before checking this in.

@mmitche
Copy link
Member Author

mmitche commented Jul 1, 2024

@jander-msft https://dev.azure.com/dnceng/internal/_build/results?buildId=2486275 looking good now, aside from the unrelated Microbuild installation issue

@mmitche mmitche merged commit 92aa57b into dotnet:main Jul 2, 2024
25 checks passed
@mmitche mmitche deleted the federated-connections branch July 2, 2024 14:20
@jander-msft
Copy link
Member

/backport to release/8.0

Copy link
Contributor

github-actions bot commented Jul 2, 2024

Started backporting to release/8.0: https://github.com/dotnet/dotnet-monitor/actions/runs/9764910139

Copy link
Contributor

github-actions bot commented Jul 2, 2024

@jander-msft backporting to release/8.0 failed, the patch most likely resulted in conflicts.

Please backport manually using one of the below commands, followed by git am --continue once the merge conflict has been resolved.

PowerShell

(Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/92aa57ba85c15bcefa4bc970a15f7818ad844bb0.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch

Bash

curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/92aa57ba85c15bcefa4bc970a15f7818ad844bb0.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch

git am error output:

$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch

Applying: Use federated connections for storage account and apiscan access (#6892)
Using index info to reconstruct a base tree...
A	eng/pipelines/dotnet-monitor-compliance.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): eng/pipelines/dotnet-monitor-compliance.yml deleted in HEAD and modified in Use federated connections for storage account and apiscan access (#6892). Version Use federated connections for storage account and apiscan access (#6892) of eng/pipelines/dotnet-monitor-compliance.yml 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 Use federated connections for storage account and apiscan access (#6892)
Error: The process '/usr/bin/git' failed with exit code 128

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.

None yet

2 participants