Add option in OAuthCred to load authUrlV2. #3777
Merged
Conversation
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
e74b6fa to
4af9b2c
Compare
TingluoHuang
commented
Mar 31, 2025
| { | ||
| credData = migratedCred; | ||
|
|
||
| // Re-write .credentials with Token URL |
There was a problem hiding this comment.
remove the code left when we finish SPS->Token migration.
We still want to keep .credentials and .credentials_migrated for a while in this case.
TingluoHuang
commented
Mar 31, 2025
| @@ -51,21 +51,16 @@ public VssCredentials LoadCredentials() | |||
|
|
|||
| CredentialData credData = store.GetCredentials(); | |||
| var migratedCred = store.GetMigratedCredentials(); | |||
| if (migratedCred != null) | |||
| if (migratedCred != null && | |||
| migratedCred.Scheme == Constants.Configuration.OAuth) | |||
There was a problem hiding this comment.
Hosted runner will have different auth schema.
TingluoHuang
commented
Mar 31, 2025
| @@ -197,6 +197,16 @@ private async Task UpdateRunnerCredentialsAsync(string serviceType, string confi | |||
| await ReportTelemetryAsync($"Credential clientId in refreshed config '{refreshedClientId ?? "Empty"}' does not match the current credential clientId '{clientId}'."); | |||
| return; | |||
| } | |||
|
|
|||
| // make sure the credential authorizationUrl in the refreshed config match the current credential authorizationUrl for OAuth auth scheme | |||
| var authorizationUrl = _credData.Data.GetValueOrDefault("authorizationUrl", null); | |||
There was a problem hiding this comment.
this will make sure the .credentials_migrated is identical with .credentials for us to safely fallback.
4af9b2c to
231f9e1
Compare
ericsciple
approved these changes
Mar 31, 2025
marko-k0
pushed a commit
to dfinity/runner
that referenced
this pull request
May 13, 2025
sirredbeard
pushed a commit
to sirredbeard/runner
that referenced
this pull request
Jun 11, 2025
sirredbeard
pushed a commit
to sirredbeard/runner
that referenced
this pull request
Jun 11, 2025
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.
Here is the normally flow we auth with service today:
.credentialsfile to create aVssCredentialobjectVssCredentialtoConnectAsyncfor different server, ex: RunnerServer, BrokerServer, RunServer, ActionsRunServer, etc.The service will send down a newer version of the
.credentialsconfig that looks like the following:I am changing the runner.listener to realize there might be 2 types of
VssCredential, one created withauthorizationUrl, another created withauthorizationUrlV2.Different
VssCredentialwill be used forConnectAsyncfor different server.authorizationUrlauthorizationUrlauthorizationUrlV2authorizationUrlV2This PR is not making real change of using
authorizationUrlV2, since we passallowAuthUrlV2: falsein all the places we createVssCredentialviaVssCredentials GetVssCredentials(IHostContext context, bool allowAuthUrlV2);https://github.com/github/actions-runner-admin/issues/1656