Use Service Connection instead of SAS for source index stage 1 upload #14750
Conversation
This file contains 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
akoeplinger
reviewed
May 3, 2024
akoeplinger
approved these changes
May 6, 2024
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/9079639796 |
|
@directhex backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: SAS-free upload of stage 1 source index data
Using index info to reconstruct a base tree...
M .vault-config/product-builds-netsourceindexvault.yaml
A eng/common/core-templates/job/source-index-stage1.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/common/templates-official/job/source-index-stage1.yml
CONFLICT (content): Merge conflict in eng/common/templates-official/job/source-index-stage1.yml
CONFLICT (modify/delete): .vault-config/product-builds-netsourceindexvault.yaml deleted in SAS-free upload of stage 1 source index data and modified in HEAD. Version HEAD of .vault-config/product-builds-netsourceindexvault.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 SAS-free upload of stage 1 source index data
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! |
|
@directhex 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. |
directhex
added a commit
to directhex/arcade
that referenced
this pull request
May 14, 2024
mkArtakMSFT
reviewed
May 14, 2024
mmitche
pushed a commit
to mmitche/arcade
that referenced
this pull request
Jun 21, 2024
…dotnet#14766) Manual backport of dotnet#14750 to release/8.0 Needed for Spring Grove. The only repo using Arcade 8.0 but publishing to Source Index is maintenance-packages.
mmitche
pushed a commit
to mmitche/arcade
that referenced
this pull request
Jun 21, 2024
…dotnet#14766) Manual backport of dotnet#14750 to release/8.0 Needed for Spring Grove. The only repo using Arcade 8.0 but publishing to Source Index is maintenance-packages.
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR replaces our use of a SAS in a keyvault with a service connection. It is needed for Safe Secrets compliance.
Following arcade updates, this will cause the following repos to need the new service connection to be approved:
workload-versions Disable source indexing. This repo has no source to index. workload-versions#117Private run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2443766&view=results